From 9a9683659419c312ccfc99275eabda500687e31d Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Thu, 30 Jul 2015 22:40:19 +0200 Subject: [PATCH 1/4] Load bower dependencies on jsxc initialization We moved the libraries from jsxc.deb.js Signed-off-by: Lukas Matt --- app/assets/javascripts/jsxc.js | 4 ++++ app/assets/stylesheets/_application.scss | 1 + 2 files changed, 5 insertions(+) diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js index 40c8abedb..f744c97b8 100644 --- a/app/assets/javascripts/jsxc.js +++ b/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 diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index a215136f7..6cbaff0c1 100644 --- a/app/assets/stylesheets/_application.scss +++ b/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'; From 524a0bdaf0bb5a9d6d539d7893dfb1c580c13c5d Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Thu, 30 Jul 2015 22:41:47 +0200 Subject: [PATCH 2/4] Obsolete with diaspora/jsxc#113 Using the logout element caused some trouble in the past Signed-off-by: Lukas Matt --- app/assets/javascripts/jsxc.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js index f744c97b8..76a3163c5 100644 --- a/app/assets/javascripts/jsxc.js +++ b/app/assets/javascripts/jsxc.js @@ -12,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, From fbc88ab56f31eea80bbc6d98eea447483485f4bf Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Thu, 30 Jul 2015 22:42:33 +0200 Subject: [PATCH 3/4] Adjusting chat implementation into diaspora container Signed-off-by: Lukas Matt --- app/assets/stylesheets/chat.scss | 4 ++-- app/assets/stylesheets/new_styles/_base.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/chat.scss b/app/assets/stylesheets/chat.scss index 88232bcf4..3be259038 100644 --- a/app/assets/stylesheets/chat.scss +++ b/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; } } diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index e95f48fbc..483ff3e5e 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/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; From c95164a7e9fac74eb046036845be1751a5979e57 Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Thu, 30 Jul 2015 22:59:53 +0200 Subject: [PATCH 4/4] bump diaspora_jsxc to v0.1.3 Signed-off-by: Lukas Matt --- Gemfile | 2 +- Gemfile.lock | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index bc5c790e5..ffa46e376 100644 --- a/Gemfile +++ b/Gemfile @@ -150,7 +150,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 diff --git a/Gemfile.lock b/Gemfile.lock index c8da2359f..c197bea56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -537,12 +537,16 @@ GEM railties (= 4.2.3) sprockets-rails rails-assets-autosize (3.0.8) - rails-assets-diaspora_jsxc (0.1.1) - rails-assets-jquery (~> 1.11.1) - rails-assets-jquery-colorbox (~> 1.5.14) - rails-assets-jquery-fullscreen (~> 1.1.4) - rails-assets-jquery-ui (~> 1.10.4) - rails-assets-jquery.slimscroll (~> 1.3.3) + rails-assets-colorbox (1.6.3) + rails-assets-jquery (>= 1.3.2) + rails-assets-diaspora_jsxc (0.1.3) + 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-highlightjs (8.6.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) @@ -552,17 +556,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 (>= 1.3.2) - rails-assets-jquery-fullscreen (1.1.4) + rails-assets-jquery-fullscreen-plugin (0.5.0) 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)!