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

Merge pull request #5648 from Zauberstuhl/jsxc_use_ajax_login

Browse source 
Adjust jsxc initialization for ajax login
This commit is contained in:
Jonne Haß 2015-02-27 15:52:30 +01:00
commit 205f82bfd0
3 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -136,8 +136,8 @@ gem 'twitter', '4.8.1'
gem 'omniauth-wordpress','0.2.1' gem 'omniauth-wordpress','0.2.1'
# XMPP chat dependencies # XMPP chat dependencies
gem 'diaspora-vines', '~> 0.1.25' gem 'diaspora-vines', '~> 0.1.27'
gem 'rails-assets-diaspora_jsxc', '~> 0.0.9' gem 'rails-assets-diaspora_jsxc', '~> 0.0.12'
# Tags # Tags

14
Gemfile.lock
View file

@ -137,11 +137,11 @@ GEM
rails (>= 3.0.4) rails (>= 3.0.4)
warden warden
warden warden
diaspora-vines (0.1.25) diaspora-vines (0.1.27)
activerecord (~> 4.1.4) activerecord (~> 4.1)
bcrypt (~> 3.1) bcrypt (~> 3.1)
em-hiredis (~> 0.3.0) em-hiredis (~> 0.3.0)
eventmachine (~> 1.0) eventmachine (>= 1.0.5, < 1.1)
http_parser.rb (~> 0.6) http_parser.rb (~> 0.6)
nokogiri (~> 1.6) nokogiri (~> 1.6)
diff-lcs (1.2.5) diff-lcs (1.2.5)
@ -161,7 +161,7 @@ GEM
erubis (2.7.0) erubis (2.7.0)
ethon (0.7.1) ethon (0.7.1)
ffi (>= 1.3.0) ffi (>= 1.3.0)
eventmachine (1.0.4) eventmachine (1.0.7)
excon (0.41.0) excon (0.41.0)
execjs (2.2.2) execjs (2.2.2)
factory_girl (4.5.0) factory_girl (4.5.0)
@ -423,7 +423,7 @@ GEM
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8) railties (= 4.1.8)
sprockets-rails (~> 2.0) 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 (~> 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)
@ -646,7 +646,7 @@ DEPENDENCIES
devise (= 3.4.1) devise (= 3.4.1)
devise-token_authenticatable (~> 0.3.0) devise-token_authenticatable (~> 0.3.0)
devise_lastseenable (= 0.0.4) devise_lastseenable (= 0.0.4)
diaspora-vines (~> 0.1.25) diaspora-vines (~> 0.1.27)
entypo-rails (= 2.2.2) entypo-rails (= 2.2.2)
factory_girl_rails (= 4.5.0) factory_girl_rails (= 4.5.0)
faraday (= 0.9.0) faraday (= 0.9.0)
@ -695,7 +695,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.8) 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-jasmine-ajax (= 3.0.0)
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)

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