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

Merge pull request #5421 from Zauberstuhl/optimize_jsxc_login_process

Browse source 
Optimize jsxc login process and bump jsxc version
This commit is contained in:
Jonne Haß 2014-11-24 23:01:03 +01:00
commit 49dfc27011
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -129,7 +129,7 @@ gem 'omniauth-wordpress','0.2.1'
# XMPP chat dependencies # XMPP chat dependencies
gem 'diaspora-vines', '~> 0.1.25' gem 'diaspora-vines', '~> 0.1.25'
gem 'rails-assets-diaspora_jsxc', '~> 0.0.4' gem 'rails-assets-diaspora_jsxc', '~> 0.0.8'
# Tags # Tags

4
Gemfile.lock
View file

@ -385,7 +385,7 @@ GEM
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.7) railties (= 4.1.7)
sprockets-rails (~> 2.0) 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 (~> 1.11.1)
rails-assets-jquery-colorbox (~> 1.5.14) rails-assets-jquery-colorbox (~> 1.5.14)
rails-assets-jquery-fullscreen (~> 1.1.4) rails-assets-jquery-fullscreen (~> 1.1.4)
@ -630,7 +630,7 @@ DEPENDENCIES
rack-rewrite (= 1.5.0) rack-rewrite (= 1.5.0)
rack-ssl (= 1.4.1) rack-ssl (= 1.4.1)
rails (= 4.1.7) 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-jeresig--jquery.hotkeys (= 0.2.0)
rails-assets-jquery (= 1.11.1) rails-assets-jquery (= 1.11.1)
rails-assets-jquery-idletimer (= 1.0.1) rails-assets-jquery-idletimer (= 1.0.1)

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

@ -24,20 +24,24 @@ $(document).ready(function() {
displayRosterMinimized: function() { displayRosterMinimized: function() {
return true; return true;
}, },
xmpp: { loginForm: {
url: $('script#jsxc').data('endpoint'), form: '#jsxc_loginForm'
username: jid.replace(/@.*?$/g, ''), },
domain: jid.replace(/^.*?@/g, ''), loadSettings: function() {
jid: jid, return {
password: data['token'], xmpp: {
resource: 'diaspora-jsxc', url: $('script#jsxc').data('endpoint'),
overwrite: true, username: jid.replace(/@.*?$/g, ''),
onlogin: true 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 { } else {
console.error('No token found! Authenticated!?'); console.error('No token found! Authenticated!?');
} }