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] 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 {