From 9a9683659419c312ccfc99275eabda500687e31d Mon Sep 17 00:00:00 2001 From: Lukas Matt Date: Thu, 30 Jul 2015 22:40:19 +0200 Subject: [PATCH] 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';