From cf4143f4a1101713ecf58aca2fdaaf3a4ac25261 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Sat, 18 Jul 2015 18:46:47 +0200 Subject: [PATCH] Remove jquery-idletimer --- Gemfile | 1 - Gemfile.lock | 2 -- app/assets/javascripts/main.js | 1 - 3 files changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index 4ff819297..4aacb0e4b 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,6 @@ source "https://rails-assets.org" do # 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.2" gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-perfect-scrollbar", "0.6.3" diff --git a/Gemfile.lock b/Gemfile.lock index d494fc9c2..b52f1a36d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -533,7 +533,6 @@ 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.2) rails-assets-jquery (>= 1.6) rails-assets-jquery-simulate (1.0.1) @@ -824,7 +823,6 @@ DEPENDENCIES rails-assets-jasmine-ajax (= 3.1.1)! 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.2)! rails-assets-jquery-simulate (= 1.0.1)! rails-assets-jquery-simulate-ext (= 1.3.0)! diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 58f9db688..5fe54a767 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 -- GitLab