diff --git a/Gemfile b/Gemfile index 22408ed0e8280d12fa9f9fa2d985b8ea8900052b..03acee59791a06ffe1921f5fbf1525f755787a3f 100644 --- a/Gemfile +++ b/Gemfile @@ -92,22 +92,21 @@ gem "js-routes", "1.0.1" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails - gem "rails-assets-markdown-it", "4.3.0" + gem "rails-assets-markdown-it", "4.4.0" gem "rails-assets-markdown-it-hashtag", "0.3.1" gem "rails-assets-markdown-it-diaspora-mention", "0.3.0" gem "rails-assets-markdown-it-sanitizer", "0.3.1" gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1" gem "rails-assets-markdown-it-sub", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0" - gem "rails-assets-highlightjs", "8.5.0" + gem "rails-assets-highlightjs", "8.6.0" # jQuery plugins gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" - gem "rails-assets-jquery-idletimer", "1.0.1" - gem "rails-assets-jquery-placeholder", "2.1.1" + gem "rails-assets-jquery-placeholder", "2.1.2" gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.2" + gem "rails-assets-perfect-scrollbar", "0.6.3" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" end @@ -286,7 +285,7 @@ group :development, :test do # Jasmine (client side application tests (JS)) gem "jasmine", "2.2.0" gem "jasmine-jquery-rails", "2.0.3" - gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org" + gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" # silence assets diff --git a/Gemfile.lock b/Gemfile.lock index 3c87d1f6e6ddc4fc8edca9ee9add1b80293b77c1..703cbebda72f29591d42aa09a3a65c2797199565 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -521,11 +521,11 @@ GEM rails-assets-jquery-fullscreen (~> 1.1.4) rails-assets-jquery-ui (~> 1.10.4) rails-assets-jquery.slimscroll (~> 1.3.3) - rails-assets-highlightjs (8.5.0) + rails-assets-highlightjs (8.6.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) rails-assets-jasmine (2.3.4) - rails-assets-jasmine-ajax (3.1.1) + rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine (~> 2) rails-assets-jeresig--jquery.hotkeys (0.2.0) rails-assets-jquery (>= 1.4.2) @@ -533,8 +533,7 @@ GEM rails-assets-jquery-colorbox (1.5.15) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen (1.1.4) - rails-assets-jquery-idletimer (1.0.1) - rails-assets-jquery-placeholder (2.1.1) + rails-assets-jquery-placeholder (2.1.2) rails-assets-jquery (>= 1.6) rails-assets-jquery-simulate (1.0.1) rails-assets-jquery-simulate-ext (1.3.0) @@ -546,13 +545,13 @@ GEM rails-assets-jquery.slimscroll (1.3.6) rails-assets-jquery (>= 1.7) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) - rails-assets-markdown-it (4.3.0) + rails-assets-markdown-it (4.4.0) rails-assets-markdown-it-diaspora-mention (0.3.0) rails-assets-markdown-it-hashtag (0.3.1) rails-assets-markdown-it-sanitizer (0.3.1) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-perfect-scrollbar (0.6.2) + rails-assets-perfect-scrollbar (0.6.3) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.6) @@ -819,24 +818,23 @@ DEPENDENCIES rails (= 4.2.3) rails-assets-autosize (= 3.0.6)! rails-assets-diaspora_jsxc (~> 0.1.1)! - rails-assets-highlightjs (= 8.5.0)! + rails-assets-highlightjs (= 8.6.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! - rails-assets-jasmine-ajax (= 3.1.1)! + rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! rails-assets-jquery (= 1.11.2)! - rails-assets-jquery-idletimer (= 1.0.1)! - rails-assets-jquery-placeholder (= 2.1.1)! + rails-assets-jquery-placeholder (= 2.1.2)! rails-assets-jquery-simulate (= 1.0.1)! rails-assets-jquery-simulate-ext (= 1.3.0)! rails-assets-jquery-textchange (= 0.2.3)! - rails-assets-markdown-it (= 4.3.0)! + rails-assets-markdown-it (= 4.4.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 0.3.0)! rails-assets-markdown-it-hashtag (= 0.3.1)! rails-assets-markdown-it-sanitizer (= 0.3.1)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-perfect-scrollbar (= 0.6.2)! + rails-assets-perfect-scrollbar (= 0.6.3)! rails-i18n (= 4.0.4) rails-timeago (= 2.11.0) rails_admin (= 0.6.8) diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 58f9db6884245d60f00e7a9e14bee81f8f5d47fa..5fe54a767de7a49e1c5ccdc997f1df243b820d34 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -17,7 +17,6 @@ //= require jquery.events.input //= require jakobmattsson-jquery-elastic //= require jquery.mentionsInput -//= require jquery-idletimer/dist/idle-timer //= require jquery.infinitescroll-custom //= require jquery.autocomplete-custom //= require jquery-ui/core