Merge pull request #6276 from Zauberstuhl/fix_broken_jsxc

bump diaspora_jsxc to v0.1.2

Gemfile

@@ -151,7 +151,7 @@ gem "active_model_serializers", "0.9.3"
 
 # XMPP chat dependencies
 gem "diaspora-vines",             "~> 0.1.27"
-gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org"
+gem "rails-assets-diaspora_jsxc", "~> 0.1.3", source: "https://rails-assets.org"
 
 # Tags
 

Gemfile.lock

@@ -535,12 +535,16 @@ GEM
       railties (= 4.2.3)
       sprockets-rails
     rails-assets-autosize (3.0.8)
-    rails-assets-diaspora_jsxc (0.1.1)
+    rails-assets-colorbox (1.6.3)
-      rails-assets-jquery (~> 1.11.1)
+      rails-assets-jquery (>= 1.3.2)
-      rails-assets-jquery-colorbox (~> 1.5.14)
+    rails-assets-diaspora_jsxc (0.1.3)
-      rails-assets-jquery-fullscreen (~> 1.1.4)
+      rails-assets-colorbox (= 1.6.3)
-      rails-assets-jquery-ui (~> 1.10.4)
+      rails-assets-favico.js (= 0.3.9)
-      rails-assets-jquery.slimscroll (~> 1.3.3)
+      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-highlightjs (8.6.0)
     rails-assets-jakobmattsson--jquery-elastic (1.6.11)
       rails-assets-jquery (>= 1.2.6)
@@ -550,17 +554,15 @@ 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.5.15)
+    rails-assets-jquery-fullscreen-plugin (0.5.0)
-      rails-assets-jquery (>= 1.3.2)
-    rails-assets-jquery-fullscreen (1.1.4)
     rails-assets-jquery-placeholder (2.1.2)
       rails-assets-jquery (>= 1.6)
     rails-assets-jquery-textchange (0.2.3)
       rails-assets-jquery
-    rails-assets-jquery-ui (1.10.4)
-      rails-assets-jquery (>= 1.6)
     rails-assets-jquery.slimscroll (1.3.6)
       rails-assets-jquery (>= 1.7)
+    rails-assets-jquery.ui (1.11.4)
+      rails-assets-jquery (>= 1.6)
     rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
     rails-assets-markdown-it (4.4.0)
     rails-assets-markdown-it-diaspora-mention (0.3.0)
@@ -846,7 +848,7 @@ DEPENDENCIES
   rack-ssl (= 1.4.1)
   rails (= 4.2.3)
   rails-assets-autosize (= 3.0.8)!
-  rails-assets-diaspora_jsxc (~> 0.1.1)!
+  rails-assets-diaspora_jsxc (~> 0.1.3)!
   rails-assets-highlightjs (= 8.6.0)!
   rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
   rails-assets-jasmine-ajax (= 3.2.0)!

app/assets/javascripts/jsxc.js

@@ -1,3 +1,7 @@
+//= require jquery.slimscroll
+//= require colorbox
+//= require favico.js
+//= require jquery-fullscreen-plugin
 //= require diaspora_jsxc
 
 // initialize jsxc xmpp client
@@ -8,7 +12,6 @@ $(document).ready(function() {
         var jid = app.currentUser.get('diaspora_id');
         jsxc.init({
           root: '/assets/diaspora_jsxc',
-          logoutElement: $('.user-menu-item [data-method=delete]'),
           rosterAppend: 'body',
           otr: {
             debug: true,

app/assets/stylesheets/_application.scss

@@ -73,6 +73,7 @@
 @import 'stream';
 @import 'stream_element';
 @import 'comments';
+@import 'colorbox';
 @import 'diaspora_jsxc';
 @import 'chat';
 @import 'markdown-content';

app/assets/stylesheets/chat.scss

@@ -1,7 +1,7 @@
-body > .container.chat-roster-shown {
+body > .container-fluid.chat-roster-shown {
   padding-right: 224px;
   #back-to-top { right: 244px; }
 }
-body > .container.chat-roster-hidden {
+body > .container-fluid.chat-roster-hidden {
   #back-to-top { right: 54px; }
 }

app/assets/stylesheets/new_styles/_base.scss

@@ -56,7 +56,7 @@ a.tag { word-break: break-all; }
   color: white;
   position: fixed;
   z-index: 49;
-  right: 20px;
+  right: 54px;
   bottom: 20px;
   opacity: 0;
   font-size: 2.9em;