From b9729db0d6432758bba90518d1c128dfe290437d Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Mon, 30 Nov 2015 15:06:15 +0100 Subject: [PATCH] bump jsxc to v0.1.5.develop Signed-off-by: Lukas Matt --- Gemfile | 2 +- Gemfile.lock | 21 ++++++++++----------- app/assets/javascripts/jsxc.js | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 0fc21391d..b1389fe27 100644 --- a/Gemfile +++ b/Gemfile @@ -155,7 +155,7 @@ gem "active_model_serializers", "0.9.3" # XMPP chat dependencies gem "diaspora-vines", "~> 0.2.0.develop" -gem "rails-assets-diaspora_jsxc", "~> 0.1.4.develop", source: "https://rails-assets.org" +gem "rails-assets-diaspora_jsxc", "~> 0.1.5.develop", source: "https://rails-assets.org" # Tags diff --git a/Gemfile.lock b/Gemfile.lock index 6f2eab681..ca7d94574 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -560,14 +560,14 @@ GEM sprockets-rails rails-assets-autosize (3.0.14) rails-assets-blueimp-gallery (2.16.0) - rails-assets-diaspora_jsxc (0.1.4.develop.4) - rails-assets-favico.js (= 0.3.9) - rails-assets-jquery (= 1.11.2) - rails-assets-jquery-colorbox (= 1.6.3) - rails-assets-jquery-fullscreen-plugin (= 0.5.0) - rails-assets-jquery.slimscroll (= 1.3.6) - rails-assets-jquery.ui (= 1.11.4) - rails-assets-favico.js (0.3.9) + rails-assets-diaspora_jsxc (0.1.5.develop.1) + rails-assets-favico.js (~> 0.3.9) + rails-assets-jquery (>= 1.11) + rails-assets-jquery-colorbox (~> 1.6.3) + rails-assets-jquery-fullscreen-plugin (~> 0.5.0) + rails-assets-jquery.slimscroll (~> 1.3.6) + rails-assets-jquery.ui (~> 1.11.4) + rails-assets-favico.js (0.3.10) rails-assets-highlightjs (8.9.1) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) @@ -584,8 +584,7 @@ GEM rails-assets-jquery (>= 1.6) rails-assets-jquery-textchange (0.2.3) rails-assets-jquery - rails-assets-jquery.slimscroll (1.3.6) - rails-assets-jquery (>= 1.7) + rails-assets-jquery.slimscroll (1.3.7) rails-assets-jquery.ui (1.11.4) rails-assets-jquery (>= 1.6) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) @@ -884,7 +883,7 @@ DEPENDENCIES rails (= 4.2.5) rails-assets-autosize (= 3.0.14)! rails-assets-blueimp-gallery (= 2.16.0)! - rails-assets-diaspora_jsxc (~> 0.1.4.develop)! + rails-assets-diaspora_jsxc (~> 0.1.5.develop)! rails-assets-highlightjs (= 8.9.1)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)! diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js index 79b376d79..d2774dafb 100644 --- a/app/assets/javascripts/jsxc.js +++ b/app/assets/javascripts/jsxc.js @@ -1,4 +1,4 @@ -//= require jquery.slimscroll +//= require jquery.slimscroll/jquery.slimscroll //= require jquery-colorbox //= require favico.js //= require jquery-fullscreen-plugin @@ -24,7 +24,7 @@ $(document).ready(function() { chat: 1 }, displayRosterMinimized: function() { - return true; + return false; }, xmpp: { url: $('script#jsxc').data('endpoint'),