From 44bc48ad5e1e7f96448fee5b863b88357bfd98e3 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Mon, 24 Nov 2014 17:19:09 +0100
Subject: [PATCH 1/4] Remove debug output on default

---
 app/assets/javascripts/jsxc.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js
index 13b70a81a..200177f9b 100644
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -35,8 +35,6 @@ $(document).ready(function() {
             onlogin: true
           }
         });
-        // TODO unset debug on default (testing version)
-        jsxc.storage.setItem('debug', true);
         jsxc.login();
       } else {
         console.error('No token found! Authenticated!?');

From 0d4da2fba8bed4b74a714bf703b6be6f3daea727 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Mon, 24 Nov 2014 17:19:30 +0100
Subject: [PATCH 2/4] Login function deprecated

related to diaspora/jsxc#50
---
 app/assets/javascripts/jsxc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js
index 200177f9b..8b6ec0508 100644
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -35,7 +35,6 @@ $(document).ready(function() {
             onlogin: true
           }
         });
-        jsxc.login();
       } else {
         console.error('No token found! Authenticated!?');
       }

From ef29de817634bfc62041675c9e2ee195b84b385b Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Mon, 24 Nov 2014 17:19:57 +0100
Subject: [PATCH 3/4] Configure form element and move xmpp config

---
 app/assets/javascripts/jsxc.js | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js
index 8b6ec0508..456813851 100644
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -24,15 +24,22 @@ $(document).ready(function() {
           displayRosterMinimized: function() {
             return true;
           },
-          xmpp: {
-            url: $('script#jsxc').data('endpoint'),
-            username: jid.replace(/@.*?$/g, ''),
-            domain: jid.replace(/^.*?@/g, ''),
-            jid: jid,
-            password: data['token'],
-            resource: 'diaspora-jsxc',
-            overwrite: true,
-            onlogin: true
+          loginForm: {
+            form: '#jsxc_loginForm'
+          },
+          loadSettings: function() {
+            return {
+              xmpp: {
+                url: $('script#jsxc').data('endpoint'),
+                username: jid.replace(/@.*?$/g, ''),
+                domain: jid.replace(/^.*?@/g, ''),
+                jid: jid,
+                password: data['token'],
+                resource: 'diaspora-jsxc',
+                overwrite: true,
+                onlogin: true
+              }
+            }
           }
         });
       } else {

From 77ce94db40e42864bb7ac5fc70d54fa113cd778a Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas.matt@sophos.com>
Date: Mon, 24 Nov 2014 19:12:05 +0100
Subject: [PATCH 4/4] bump jsxc to version 0.0.8

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 62b65e745..56ae0a4ab 100644
--- a/Gemfile
+++ b/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
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ed6c55c5b..8ce354666 100644
--- a/Gemfile.lock
+++ b/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)