Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/jsxc.nextcloud.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorsualko <github@spam.herberth.eu>2014-07-02 14:41:31 +0400
committersualko <github@spam.herberth.eu>2014-07-02 14:41:31 +0400
commit10c51ee151f14d145888cbef613351c9d0d7c260 (patch)
tree3c9a46b2a0523ba9c7854d34f947f0035e267406 /build
parentecef5e44ee6eaa4ad0e2b1c048c1be37a762aedd (diff)
build v0.8.0
Diffstat (limited to 'build')
-rw-r--r--build/appinfo/info.xml2
-rw-r--r--build/appinfo/version2
-rw-r--r--build/css/jsxc.oc.css4
-rw-r--r--build/js/admin.js4
-rw-r--r--build/js/eof.js4
-rw-r--r--build/js/jsxc/jsxc.css68
-rw-r--r--build/js/jsxc/jsxc.lib.js88
-rw-r--r--build/js/jsxc/jsxc.lib.webrtc.js4
-rw-r--r--build/js/ojsxc.js4
9 files changed, 132 insertions, 48 deletions
diff --git a/build/appinfo/info.xml b/build/appinfo/info.xml
index a4c27ed..06ef494 100644
--- a/build/appinfo/info.xml
+++ b/build/appinfo/info.xml
@@ -3,7 +3,7 @@
<id>ojsxc</id>
<name>JavaScript XMPP Chat</name>
<description>XMPP Chat with OTR</description>
- <version>0.8.0-beta</version>
+ <version>0.8.0</version>
<licence>MIT</licence>
<author>Klaus Herberth</author>
<require>5</require>
diff --git a/build/appinfo/version b/build/appinfo/version
index c35637f..8adc70f 100644
--- a/build/appinfo/version
+++ b/build/appinfo/version
@@ -1 +1 @@
-0.8.0-beta \ No newline at end of file
+0.8.0 \ No newline at end of file
diff --git a/build/css/jsxc.oc.css b/build/css/jsxc.oc.css
index 2b6ac54..e125bd2 100644
--- a/build/css/jsxc.oc.css
+++ b/build/css/jsxc.oc.css
@@ -1,5 +1,5 @@
/**
- * ojsxc v0.8.0-beta - 2014-06-27
+ * ojsxc v0.8.0 - 2014-07-02
*
* Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
* Released under the MIT license
@@ -7,7 +7,7 @@
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.8.0-beta
+ * @version 0.8.0
*/
div#jsxc_roster {
diff --git a/build/js/admin.js b/build/js/admin.js
index 45e72d5..96e838e 100644
--- a/build/js/admin.js
+++ b/build/js/admin.js
@@ -1,5 +1,5 @@
/**
- * ojsxc v0.8.0-beta - 2014-06-27
+ * ojsxc v0.8.0 - 2014-07-02
*
* Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
* Released under the MIT license
@@ -7,7 +7,7 @@
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.8.0-beta
+ * @version 0.8.0
*/
$(document).ready(function() {
diff --git a/build/js/eof.js b/build/js/eof.js
index 6f5b658..8d22610 100644
--- a/build/js/eof.js
+++ b/build/js/eof.js
@@ -1,5 +1,5 @@
/**
- * ojsxc v0.8.0-beta - 2014-06-27
+ * ojsxc v0.8.0 - 2014-07-02
*
* Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
* Released under the MIT license
@@ -7,7 +7,7 @@
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.8.0-beta
+ * @version 0.8.0
*/
/**
diff --git a/build/js/jsxc/jsxc.css b/build/js/jsxc/jsxc.css
index 2912516..3667a27 100644
--- a/build/js/jsxc/jsxc.css
+++ b/build/js/jsxc/jsxc.css
@@ -371,6 +371,10 @@ ul#jsxc_buddylist li {
overflow: hidden;
}
+ul#jsxc_buddylist .jsxc_name {
+ padding-right: 30px;
+}
+
ul#jsxc_buddylist li.jsxc_expand {
height: 54px;
}
@@ -380,6 +384,46 @@ ul#jsxc_buddylist li.jsxc_expand .jsxc_avatar, ul#jsxc_buddylist li.jsxc_expand
height: 48px;
}
+#jsxc_buddylist .jsxc_control {
+ position:absolute;
+ width: 30px;
+ height: 30px;
+ top: 0px;
+ right: 0px;
+ cursor: pointer;
+}
+
+#jsxc_buddylist .jsxc_control:after {
+ content: '▾';
+ position: absolute;
+ left: 50%;
+ top: 15px;
+ width: 16px;
+ height: 16px;
+ line-height: 16px;
+ text-align: center;
+ margin-left: -8px;
+ margin-top: -8px;
+ border-radius: 8px;
+ color: #c1c1c1;
+ background-color: rgba(150, 150, 150, 0.5);
+ opacity: 0.6;
+ -webkit-transition: -webkit-transform 0.5s;
+ transition: transform 0.5s;
+}
+
+#jsxc_buddylist .jsxc_control:hover:after {
+ color: #fff;
+ opacity: 1.0;
+}
+
+#jsxc_buddylist li.jsxc_expand .jsxc_control:after {
+ /* content: '▴'; */
+ -ms-transform:rotate(180deg); /* IE 9 */
+ -webkit-transform:rotate(180deg);
+ transform:rotate(180deg);
+}
+
#jsxc_buddylist .jsxc_options {
height: 20px;
float: left;
@@ -470,30 +514,6 @@ ul#jsxc_buddylist .jsxc_delete {
cursor: pointer;
}
-#jsxc_roster .jsxc_avatar:after {
- content: '▼';
- display: block;
- text-align: center;
- width: 10px;
- height: 10px;
- line-height: 10px;
- font-size: 8px;
- position: absolute;
- bottom: 0px;
- right: 0px;
- border-radius: 2px;
- color:#000;
- background-color: #fff;
- opacity: 0;
-}
-
-#jsxc_roster .jsxc_avatar:hover:after {
- opacity: 1.0 !important;
-}
-#jsxc_roster li:hover .jsxc_avatar:after {
- opacity: 0.6;
-}
-
div#jsxc_toggleRoster {
width: 14px;
height: 100%;
diff --git a/build/js/jsxc/jsxc.lib.js b/build/js/jsxc/jsxc.lib.js
index eb62e68..5a73b9f 100644
--- a/build/js/jsxc/jsxc.lib.js
+++ b/build/js/jsxc/jsxc.lib.js
@@ -1,5 +1,5 @@
/**
- * jsxc v0.8.0-beta - 2014-06-27
+ * jsxc v0.8.0 - 2014-07-02
*
* Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
* Released under the MIT license
@@ -7,7 +7,7 @@
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.8.0-beta
+ * @version 0.8.0
*/
var jsxc;
@@ -22,7 +22,7 @@ var jsxc;
*/
jsxc = {
/** Version of jsxc */
- version: '0.8.0-beta',
+ version: '0.8.0',
/** True if i'm the master */
master: false,
@@ -782,8 +782,8 @@ var jsxc;
ue.removeClass('jsxc_' + jsxc.CONST.STATUS.join(' jsxc_')).addClass('jsxc_' + jsxc.CONST.STATUS[data.status]);
// Change name and add title
- ue.find('.jsxc_name').text(data.name).attr('title', 'is ' + jsxc.CONST.STATUS[data.status]);
- bullet.attr('title', 'is ' + jsxc.CONST.STATUS[data.status]);
+ ue.find('.jsxc_name').text(data.name).attr('title', jsxc.l.is + ' ' + jsxc.CONST.STATUS[data.status]);
+ bullet.attr('title', jsxc.l.is + ' ' + jsxc.CONST.STATUS[data.status]);
// Update gui according to encryption state
switch (data.msgstate) {
@@ -1622,14 +1622,17 @@ var jsxc;
return false;
});
- bud.find('.jsxc_avatar').click(function() {
+ var expandClick = function() {
bud.trigger('extra.jsxc');
bud.toggleClass('jsxc_expand');
jsxc.gui.updateAvatar(bud, data.jid, data.avatar);
return false;
- });
+ };
+
+ bud.find('.jsxc_control').click(expandClick);
+ bud.dblclick(expandClick);
bud.find('.jsxc_vcardicon').click(function() {
jsxc.gui.showVcard(data.jid);
@@ -1729,7 +1732,7 @@ var jsxc;
*/
rename: function(cid) {
var name = $('#' + cid + ' .jsxc_name');
- var options = $('#' + cid + ' .jsxc_options');
+ var options = $('#' + cid).find('.jsxc_options, .jsxc_control');
var input = $('<input type="text" name="name"/>');
options.hide();
@@ -2529,6 +2532,7 @@ var jsxc;
</div>',
rosterBuddy: '<li>\
<div class="jsxc_avatar">☺</div>\
+ <div class="jsxc_control"></div>\
<div class="jsxc_name"/>\
<div class="jsxc_options jsxc_right">\
<div class="jsxc_rename" title="%%rename_buddy%%">✎</div>\
@@ -4705,7 +4709,8 @@ var jsxc;
User_settings: 'User settings',
A_fingerprint_: 'A fingerprint is used to make sure that the person you are talking to is who he or she is saying.',
Your_roster_is_empty_add_a: 'Your roster is empty, add a ',
- new_buddy: 'new buddy'
+ new_buddy: 'new buddy',
+ is: 'is'
},
de: {
please_wait_until_we_logged_you_in: 'Bitte warte bis wir dich eingeloggt haben.',
@@ -4809,11 +4814,39 @@ var jsxc;
Dismiss: 'Ablehnen',
Remove: 'Löschen',
Online_help: 'Online Hilfe',
+ FN: 'Name',
+ N: ' ',
+ FAMILY: 'Familienname',
+ GIVEN: 'Vorname',
+ NICKNAME: 'Spitzname',
+ URL: 'URL',
+ ADR: 'Adresse',
+ STREET: 'Straße',
+ EXTADD: 'Zusätzliche Adresse',
+ LOCALITY: 'Ortschaft',
+ REGION: 'Region',
+ PCODE: 'Postleitzahl',
+ CTRY: 'Land',
+ TEL: 'Telefon',
+ NUMBER: 'Nummer',
+ EMAIL: 'E-Mail',
+ USERID: ' ',
+ ORG: 'Organisation',
+ ORGNAME: 'Name',
+ ORGUNIT: 'Abteilung',
+ TITLE: 'Titel',
+ ROLE: 'Rolle',
+ BDAY: 'Geburtstag',
+ DESC: 'Beschreibung',
+ PHOTO: ' ',
+ send_message: 'Sende Nachricht',
+ get_info: 'Benutzerinformationen',
Settings: 'Einstellungen',
Priority: 'Priorität',
Save: 'Speichern',
User_settings: 'Benutzereinstellungen',
- A_fingerprint_: 'Ein Fingerabdruck wird dazu benutzt deinen Gesprächspartner zu identifizieren.'
+ A_fingerprint_: 'Ein Fingerabdruck wird dazu benutzt deinen Gesprächspartner zu identifizieren.',
+ is: 'ist'
},
es: {
please_wait_until_we_logged_you_in: 'Por favor, espere...',
@@ -4912,11 +4945,42 @@ var jsxc;
Confirm: 'Confirmar',
Dismiss: 'Rechazar',
Remove: 'Eliminar',
- Online_help: 'Ayuda en línea',
+ Online_help: 'Ayuda en línea',
+ FN: 'Nombre completo ',
+ N: ' ',
+ FAMILY: 'Apellido',
+ GIVEN: 'Nombre',
+ NICKNAME: 'Apodar',
+ URL: 'URL',
+ ADR: 'Dirección',
+ STREET: 'Calle',
+ EXTADD: 'Extendido dirección',
+ LOCALITY: 'Población',
+ REGION: 'Región',
+ PCODE: 'Código postal',
+ CTRY: 'País',
+ TEL: 'Teléfono',
+ NUMBER: 'Número',
+ EMAIL: 'Emilio',
+ USERID: ' ',
+ ORG: 'Organización',
+ ORGNAME: 'Nombre',
+ ORGUNIT: 'Departamento',
+ TITLE: 'Título',
+ ROLE: 'Rol',
+ BDAY: 'Cumpleaños',
+ DESC: 'Descripción',
+ PHOTO: ' ',
+ send_message: 'mandar un texto',
+ get_info: 'obtener información',
Settings: 'Ajustes',
Priority: 'Prioridad',
Save: 'Guardar',
- User_settings: 'Configuración de usuario'
+ User_settings: 'Configuración de usuario',
+ A_fingerprint_: 'La huella digital se utiliza para que puedas estar seguro que la persona con la que estas hablando es quien realmente dice ser',
+ Your_roster_is_empty_add_a: 'Tu lista de amigos esta vacia',
+ new_buddy: 'Nuevo amigo',
+ is: 'es'
}
};
}(jQuery));
diff --git a/build/js/jsxc/jsxc.lib.webrtc.js b/build/js/jsxc/jsxc.lib.webrtc.js
index 5208753..b1abc76 100644
--- a/build/js/jsxc/jsxc.lib.webrtc.js
+++ b/build/js/jsxc/jsxc.lib.webrtc.js
@@ -1,5 +1,5 @@
/**
- * jsxc v0.8.0-beta - 2014-06-27
+ * jsxc v0.8.0 - 2014-07-02
*
* Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
* Released under the MIT license
@@ -7,7 +7,7 @@
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.8.0-beta
+ * @version 0.8.0
*/
/* jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery */
diff --git a/build/js/ojsxc.js b/build/js/ojsxc.js
index f58768f..8e4ae6f 100644
--- a/build/js/ojsxc.js
+++ b/build/js/ojsxc.js
@@ -1,5 +1,5 @@
/**
- * ojsxc v0.8.0-beta - 2014-06-27
+ * ojsxc v0.8.0 - 2014-07-02
*
* Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
* Released under the MIT license
@@ -7,7 +7,7 @@
* Please see http://www.jsxc.org/
*
* @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.8.0-beta
+ * @version 0.8.0
*/
/* global jsxc, oc_appswebroots, OC, $, oc_requesttoken */