bump jsxc to v0.1.4

Signed-off-by: Lukas Matt <[email protected]> closes diaspora#6569
Nighoo · Dec 21, 2015 · cf49276 · cf49276
1 parent c238329
commit cf49276
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/Gemfile b/Gemfile
@@ -148,7 +148,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.alpha", "< 0.1.4.develop", source: "https://rails-assets.org"
+gem "rails-assets-diaspora_jsxc", "~> 0.1.4", source: "https://rails-assets.org"
 
 # Tags
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -531,16 +531,14 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.5)
       sprockets-rails
-    rails-assets-colorbox (1.6.3)
-      rails-assets-jquery (>= 1.3.2)
-    rails-assets-diaspora_jsxc (0.1.4.alpha.1)
-      rails-assets-colorbox (= 1.6.3)
-      rails-assets-favico.js (= 0.3.9)
-      rails-assets-jquery (= 1.11.2)
-      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.4)
+      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)
@@ -550,13 +548,14 @@ GEM
     rails-assets-jeresig--jquery.hotkeys (0.2.0)
       rails-assets-jquery (>= 1.4.2)
     rails-assets-jquery (1.11.2)
+    rails-assets-jquery-colorbox (1.6.3)
+      rails-assets-jquery (>= 1.3.2)
     rails-assets-jquery-fullscreen-plugin (0.5.0)
     rails-assets-jquery-placeholder (2.1.3)
       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)
@@ -835,7 +834,7 @@ DEPENDENCIES
   rack-rewrite (= 1.5.1)
   rack-ssl (= 1.4.1)
   rails (= 4.2.5)
-  rails-assets-diaspora_jsxc (~> 0.1.4.alpha, < 0.1.4.develop)!
+  rails-assets-diaspora_jsxc (~> 0.1.4)!
   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
@@ -1,5 +1,5 @@
-//= require jquery.slimscroll
-//= require colorbox
+//= require jquery.slimscroll/jquery.slimscroll
+//= require jquery-colorbox
 //= require favico.js
 //= require jquery-fullscreen-plugin
 //= require diaspora_jsxc
@@ -25,7 +25,7 @@ $(document).ready(function() {
             chat: 1
           },
           displayRosterMinimized: function() {
-            return true;
+            return false;
           },
           xmpp: {
             url: $('script#jsxc').data('endpoint'),

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -77,7 +77,6 @@
 @import 'stream';
 @import 'stream_element';
 @import 'comments';
-@import 'colorbox';
 @import 'diaspora_jsxc';
 @import 'chat';
 @import 'markdown-content';