From 30685b2709aa919a4c28127c90b67c64c94d1ee3 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Tue, 10 Feb 2015 18:15:58 +0100
Subject: [PATCH 1/3] Adjust jsxc initialization for ajax login

related to diaspora/jsxc#81
---
 app/assets/javascripts/jsxc.js | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js
index e297ae0f6..73d130086 100644
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -8,7 +8,6 @@ $(document).ready(function() {
         var jid = app.currentUser.get('diaspora_id');
         jsxc.init({
           root: '/assets/diaspora_jsxc',
-          checkFlash: false,
           logoutElement: $('.user-menu-item [data-method=delete]'),
           rosterAppend: 'body',
           otr: {
@@ -24,22 +23,15 @@ $(document).ready(function() {
           displayRosterMinimized: function() {
             return 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
-              }
-            };
+          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 94f73be7d9f0ed839e420316a275616b5d43ff70 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Wed, 25 Feb 2015 00:06:21 +0100
Subject: [PATCH 2/3] bump Vines to v0.1.27 and Jsxc to v0.0.12

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

diff --git a/Gemfile b/Gemfile
index d92563cd1..f47f0f082 100644
--- a/Gemfile
+++ b/Gemfile
@@ -136,8 +136,8 @@ gem 'twitter',           '4.8.1'
 gem 'omniauth-wordpress','0.2.1'
 
 # XMPP chat dependencies
-gem 'diaspora-vines',             '~> 0.1.25'
-gem 'rails-assets-diaspora_jsxc', '~> 0.0.9'
+gem 'diaspora-vines',             '~> 0.1.27'
+gem 'rails-assets-diaspora_jsxc', '~> 0.0.12'
 
 # Tags
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5c0dd6db8..f757c9733 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,11 +137,11 @@ GEM
       rails (>= 3.0.4)
       warden
       warden
-    diaspora-vines (0.1.25)
-      activerecord (~> 4.1.4)
+    diaspora-vines (0.1.27)
+      activerecord (~> 4.1)
       bcrypt (~> 3.1)
       em-hiredis (~> 0.3.0)
-      eventmachine (~> 1.0)
+      eventmachine (>= 1.0.5, < 1.1)
       http_parser.rb (~> 0.6)
       nokogiri (~> 1.6)
     diff-lcs (1.2.5)
@@ -161,7 +161,7 @@ GEM
     erubis (2.7.0)
     ethon (0.7.1)
       ffi (>= 1.3.0)
-    eventmachine (1.0.4)
+    eventmachine (1.0.7)
     excon (0.41.0)
     execjs (2.2.2)
     factory_girl (4.5.0)
@@ -423,7 +423,7 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.8)
       sprockets-rails (~> 2.0)
-    rails-assets-diaspora_jsxc (0.0.10)
+    rails-assets-diaspora_jsxc (0.0.12)
       rails-assets-jquery (~> 1.11.1)
       rails-assets-jquery-colorbox (~> 1.5.14)
       rails-assets-jquery-fullscreen (~> 1.1.4)
@@ -646,7 +646,7 @@ DEPENDENCIES
   devise (= 3.4.1)
   devise-token_authenticatable (~> 0.3.0)
   devise_lastseenable (= 0.0.4)
-  diaspora-vines (~> 0.1.25)
+  diaspora-vines (~> 0.1.27)
   entypo-rails (= 2.2.2)
   factory_girl_rails (= 4.5.0)
   faraday (= 0.9.0)
@@ -695,7 +695,7 @@ DEPENDENCIES
   rack-rewrite (= 1.5.0)
   rack-ssl (= 1.4.1)
   rails (= 4.1.8)
-  rails-assets-diaspora_jsxc (~> 0.0.9)
+  rails-assets-diaspora_jsxc (~> 0.0.12)
   rails-assets-jasmine-ajax (= 3.0.0)
   rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
   rails-assets-jquery (= 1.11.1)

From e484ebc85f50818705301692963f7dd09a8f0e00 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Wed, 25 Feb 2015 00:08:58 +0100
Subject: [PATCH 3/3] Using dot notation for accessing token

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

diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js
index 73d130086..40c8abedb 100644
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -28,7 +28,7 @@ $(document).ready(function() {
             username: jid.replace(/@.*?$/g, ''),
             domain: jid.replace(/^.*?@/g, ''),
             jid: jid,
-            password: data['token'],
+            password: data.token,
             resource: 'diaspora-jsxc',
             overwrite: true,
             onlogin: true