Merge pull request #5421 from Zauberstuhl/optimize_jsxc_login_process

Optimize jsxc login process and bump jsxc version

Gemfile

@@ -129,7 +129,7 @@ gem 'omniauth-wordpress','0.2.1'
 
 # XMPP chat dependencies
 gem 'diaspora-vines',             '~> 0.1.25'
-gem 'rails-assets-diaspora_jsxc', '~> 0.0.4'
+gem 'rails-assets-diaspora_jsxc', '~> 0.0.8'
 
 # Tags
 

Gemfile.lock

@@ -385,7 +385,7 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.7)
       sprockets-rails (~> 2.0)
-    rails-assets-diaspora_jsxc (0.0.4)
+    rails-assets-diaspora_jsxc (0.0.8)
       rails-assets-jquery (~> 1.11.1)
       rails-assets-jquery-colorbox (~> 1.5.14)
       rails-assets-jquery-fullscreen (~> 1.1.4)
@@ -630,7 +630,7 @@ DEPENDENCIES
   rack-rewrite (= 1.5.0)
   rack-ssl (= 1.4.1)
   rails (= 4.1.7)
-  rails-assets-diaspora_jsxc (~> 0.0.4)
+  rails-assets-diaspora_jsxc (~> 0.0.8)
   rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
   rails-assets-jquery (= 1.11.1)
   rails-assets-jquery-idletimer (= 1.0.1)

app/assets/javascripts/jsxc.js

@@ -24,6 +24,11 @@ $(document).ready(function() {
           displayRosterMinimized: function() {
             return true;
           },
+          loginForm: {
+            form: '#jsxc_loginForm'
+          },
+          loadSettings: function() {
+            return {
               xmpp: {
                 url: $('script#jsxc').data('endpoint'),
                 username: jid.replace(/@.*?$/g, ''),
@@ -34,10 +39,9 @@ $(document).ready(function() {
                 overwrite: true,
                 onlogin: true
               }
+            }
+          }
         });
-        // TODO unset debug on default (testing version)
-        jsxc.storage.setItem('debug', true);
-        jsxc.login();
       } else {
         console.error('No token found! Authenticated!?');
       }