From 50a7541d14ca53bbf945d49579cf532e7545f979 Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Thu, 13 Nov 2014 11:17:19 +0100 Subject: [PATCH] Include jsxc deps and initialize the client on login --- app/assets/javascripts/jsxc.js | 43 +++++++++++++++++++++++++ app/assets/stylesheets/default.css.scss | 1 + 2 files changed, 44 insertions(+) create mode 100644 app/assets/javascripts/jsxc.js diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js new file mode 100644 index 000000000..55ba8fe48 --- /dev/null +++ b/app/assets/javascripts/jsxc.js @@ -0,0 +1,43 @@ +//= require diaspora_jsxc + +// initialize jsxc xmpp client +$(document).ready(function() { + if (app.currentUser.authenticated()) { + $.post('api/v1/tokens', null, function(data) { + if (jsxc && data['token']) { + 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: { + debug: true, + SEND_WHITESPACE_TAG: true, + WHITESPACE_START_AKE: true + }, + autoLang: true, + priority: { + online: 1, + chat: 1 + }, + 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 + } + }); + // TODO unset debug on default (testing version) + jsxc.storage.setItem('debug', true); + jsxc.login(); + } else { + console.error('No token found! Authenticated!?'); + } + }, 'json'); + } +}); diff --git a/app/assets/stylesheets/default.css.scss b/app/assets/stylesheets/default.css.scss index 5dd0f979a..023b2aba3 100644 --- a/app/assets/stylesheets/default.css.scss +++ b/app/assets/stylesheets/default.css.scss @@ -11,4 +11,5 @@ *= require vendor/autoSuggest *= require entypo-fonts *= require entypo +*= require diaspora_jsxc */