nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust jsxc initialization for ajax login

Browse source 
related to diaspora/jsxc#81
This commit is contained in:
Lukas Matt 2015-02-10 18:15:58 +01:00
parent 3a0857b4bf
commit 30685b2709
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/jsxc.js
View file

@ -8,7 +8,6 @@ $(document).ready(function() {
var jid = app.currentUser.get('diaspora_id'); var jid = app.currentUser.get('diaspora_id');
jsxc.init({ jsxc.init({
root: '/assets/diaspora_jsxc', root: '/assets/diaspora_jsxc',
checkFlash: false,
logoutElement: $('.user-menu-item [data-method=delete]'), logoutElement: $('.user-menu-item [data-method=delete]'),
rosterAppend: 'body', rosterAppend: 'body',
otr: { otr: {
@ -24,11 +23,6 @@ $(document).ready(function() {
displayRosterMinimized: function() { displayRosterMinimized: function() {
return true; return true;
}, },
loginForm: {
form: '#jsxc_loginForm'
},
loadSettings: function() {
return {
xmpp: { xmpp: {
url: $('script#jsxc').data('endpoint'), url: $('script#jsxc').data('endpoint'),
username: jid.replace(/@.*?$/g, ''), username: jid.replace(/@.*?$/g, ''),
@ -39,8 +33,6 @@ $(document).ready(function() {
overwrite: true, overwrite: true,
onlogin: true onlogin: true
} }
};
}
}); });
} else { } else {
console.error('No token found! Authenticated!?'); console.error('No token found! Authenticated!?');