build v0.8.2

9 files changed, 50 insertions, 29 deletions

diff --git a/build/appinfo/app.php b/build/appinfo/app.php
index e7148f8..ea90839 100644
--- a/build/appinfo/app.php
+++ b/build/appinfo/app.php
@@ -45,7 +45,9 @@ OCP\Util::addStyle ( 'ojsxc', '../js/jsxc/jsxc.webrtc' );
 OCP\Util::addStyle ( 'ojsxc', 'jsxc.oc' );
 OCP\Util::addStyle ( 'ojsxc', 'muc' );
 
-if(OC_Util::getVersion()[0] <= 6)
+$version = OC_Util::getVersion();
+
+if($version[0] <= 6)
 	OCP\Util::addStyle ( 'ojsxc', 'jsxc.oc.lte6' );
 
-?>
\ No newline at end of file
+?>
diff --git a/build/appinfo/info.xml b/build/appinfo/info.xml
index 035ce1b..0a2a81c 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.1</version>
+	<version>0.8.2</version>
 	<licence>MIT</licence>
 	<author>Klaus Herberth</author>
 	<require>5</require>
diff --git a/build/appinfo/version b/build/appinfo/version
index c18d72b..53a48a1 100644
--- a/build/appinfo/version
+++ b/build/appinfo/version
@@ -1 +1 @@
-0.8.1
\ No newline at end of file
+0.8.2
\ No newline at end of file
diff --git a/build/css/jsxc.oc.css b/build/css/jsxc.oc.css
index 263f18b..0ad80c8 100644
--- a/build/css/jsxc.oc.css
+++ b/build/css/jsxc.oc.css
@@ -1,5 +1,5 @@
 /**
- * ojsxc v0.8.1 - 2014-08-12
+ * ojsxc v0.8.2 - 2014-08-20
  * 
  * 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.1
+ * @version 0.8.2
  */
 
 div#jsxc_roster {
diff --git a/build/js/admin.js b/build/js/admin.js
index 71bf826..9dce967 100644
--- a/build/js/admin.js
+++ b/build/js/admin.js
@@ -1,5 +1,5 @@
 /**
- * ojsxc v0.8.1 - 2014-08-12
+ * ojsxc v0.8.2 - 2014-08-20
  * 
  * 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.1
+ * @version 0.8.2
  */
 
 $(document).ready(function() {
@@ -46,7 +46,7 @@ $(document).ready(function() {
 
       var statusSet = status.clone().html(status.html() + " Saving...");
       $('#ojsxc .msg').append(statusSet);
-      console.log(post)
+
       $.post(OC.filePath('ojsxc', 'ajax', 'setsettings.php'), post, function(data) {
          if (data)
             statusSet.addClass('jsxc_success').text('Settings saved.');
diff --git a/build/js/eof.js b/build/js/eof.js
index 1edac05..d853da4 100644
--- a/build/js/eof.js
+++ b/build/js/eof.js
@@ -1,5 +1,5 @@
 /**
- * ojsxc v0.8.1 - 2014-08-12
+ * ojsxc v0.8.2 - 2014-08-20
  * 
  * 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.1
+ * @version 0.8.2
  */
 
 /**
diff --git a/build/js/jsxc/jsxc.lib.js b/build/js/jsxc/jsxc.lib.js
index 00e73db..c5692e9 100644
--- a/build/js/jsxc/jsxc.lib.js
+++ b/build/js/jsxc/jsxc.lib.js
@@ -1,5 +1,5 @@
 /**
- * jsxc v0.8.1 - 2014-08-12
+ * jsxc v0.8.2 - 2014-08-20
  * 
  * 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.1
+ * @version 0.8.2
  */
 
 var jsxc;
@@ -22,7 +22,7 @@ var jsxc;
     */
    jsxc = {
       /** Version of jsxc */
-      version: '0.8.1',
+      version: '0.8.2',
 
       /** True if i'm the master */
       master: false,
@@ -108,7 +108,9 @@ var jsxc;
          }
 
          if (data) {
-            console.log(msg, data);
+            if (jsxc.storage.getItem('debug') === true) {
+               console.log(msg, data);
+            }
 
             // try to convert data to string
             var d;
@@ -285,6 +287,10 @@ var jsxc;
                   return true;
                }
 
+               if (typeof settings.xmpp.username === 'string') {
+                  username = settings.xmpp.username;
+               }
+
                var resource = (settings.xmpp.resource) ? '/' + settings.xmpp.resource : '';
                var domain = settings.xmpp.domain;
                var jid;
@@ -312,7 +318,7 @@ var jsxc;
                jsxc.options.xmpp.jid = jid;
                jsxc.options.xmpp.password = password;
 
-               if (settings.xmpp.onlogin === "true") {
+               if (settings.xmpp.onlogin === "true" || settings.xmpp.onlogin === true) {
                   jsxc.triggeredFromForm = true;
 
                   jsxc.xmpp.login();
@@ -1451,7 +1457,7 @@ var jsxc;
       showSettings: function() {
          jsxc.gui.dialog.open(jsxc.gui.template.get('settings'));
 
-         if (jsxc.options.get('xmpp').overwrite === 'false') {
+         if (jsxc.options.get('xmpp').overwrite === 'false' || jsxc.options.get('xmpp').overwrite === false) {
             $('.jsxc_fieldsetXmpp').hide();
          }
 
@@ -2766,10 +2772,6 @@ var jsxc;
             };
          }
 
-         // Strophe.log = function(level, msg) {
-         // console.log(level + " " + msg);
-         // };
-
          var callback = function(status, condition) {
 
             jsxc.debug(Object.getOwnPropertyNames(Strophe.Status)[status] + ': ' + condition);
@@ -4809,7 +4811,12 @@ var jsxc;
          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',
-         is: 'is'
+         is: 'is',
+         Login_options: 'Login options',
+         BOSH_url: 'BOSH url',
+         Domain: 'Domain',
+         Resource: 'Resource',
+         On_login: 'On login'
       },
       de: {
          please_wait_until_we_logged_you_in: 'Bitte warte bis wir dich eingeloggt haben.',
@@ -4945,7 +4952,14 @@ var jsxc;
          Save: 'Speichern',
          User_settings: 'Benutzereinstellungen',
          A_fingerprint_: 'Ein Fingerabdruck wird dazu benutzt deinen Gesprächspartner zu identifizieren.',
-         is: 'ist'
+         Your_roster_is_empty_add_a: 'Deine Freundesliste ist leer, füge einen neuen Freund ',
+         new_buddy: 'hinzu',
+         is: 'ist',
+         Login_options: 'Anmeldeoptionen',
+         BOSH_url: 'BOSH url',
+         Domain: 'Domain',
+         Resource: 'Ressource',
+         On_login: 'Beim Anmelden'
       },
       es: {
          please_wait_until_we_logged_you_in: 'Por favor, espere...',
@@ -5079,7 +5093,12 @@ var jsxc;
          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'
+         is: 'es',
+         Login_options: 'Opciones de login',
+         BOSH_url: 'BOSH url',
+         Domain: 'Dominio',
+         Resource: 'Recurso',
+         On_login: 'Iniciar sesión'
       }
    };
 }(jQuery));
diff --git a/build/js/jsxc/jsxc.lib.webrtc.js b/build/js/jsxc/jsxc.lib.webrtc.js
index d24e556..35b81e5 100644
--- a/build/js/jsxc/jsxc.lib.webrtc.js
+++ b/build/js/jsxc/jsxc.lib.webrtc.js
@@ -1,5 +1,5 @@
 /**
- * jsxc v0.8.1 - 2014-08-12
+ * jsxc v0.8.2 - 2014-08-20
  * 
  * 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.1
+ * @version 0.8.2
  */
 
 /* jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery */
@@ -185,7 +185,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       onAddRosterItem: function(event, cid, data, el) {
          var self = jsxc.webrtc;
          var videoIcon = $('<div class="jsxc_video jsxc_disabled" title="' + jsxc.l.Start_video_call + '"></div>');
-console.log(data);
+
          videoIcon.click(function() {
             self.startCall(data.jid);
             return false;
diff --git a/build/js/ojsxc.js b/build/js/ojsxc.js
index 083eb7b..53f6d8a 100644
--- a/build/js/ojsxc.js
+++ b/build/js/ojsxc.js
@@ -1,5 +1,5 @@
 /**
- * ojsxc v0.8.1 - 2014-08-12
+ * ojsxc v0.8.2 - 2014-08-20
  * 
  * 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.1
+ * @version 0.8.2
  */
 
 /* global jsxc, oc_appswebroots, OC, $, oc_requesttoken */