diff --git a/Gemfile b/Gemfile index 05de218e889f32a5f0197363f0cf7dada2176463..dcfa1234f3cd3703673542e3022224973d23d497 100644 --- a/Gemfile +++ b/Gemfile @@ -95,24 +95,23 @@ 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.2" 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" - gem "rails-assets-autosize", "3.0.6" + gem "rails-assets-autosize", "3.0.8" end # Localization @@ -286,7 +285,7 @@ group :development, :test do # Jasmine (client side application tests (JS)) gem "jasmine", "2.3.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 0d9eaa26bafcdbf18639c125cf38964ea0ac92d0..37a6b20eb8be95bfbb5122c5a7750b0e270db282 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -534,18 +534,18 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.3) sprockets-rails - rails-assets-autosize (3.0.6) + 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-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) @@ -553,8 +553,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-textchange (0.2.3) rails-assets-jquery @@ -563,13 +562,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.2) 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) @@ -843,24 +842,23 @@ DEPENDENCIES rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) rails (= 4.2.3) - rails-assets-autosize (= 3.0.6)! + rails-assets-autosize (= 3.0.8)! 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-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.2)! 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 60ce51d13c0e01793f9d22c3ac385cfffde1b110..8ee4dfc2b12ced2443e12a30ff01cb8642abb53d 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -16,7 +16,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