Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaced jquery.idle-timer.js vendored asset with bower package #5310

Merged
merged 2 commits into from Oct 8, 2014
Merged

Replaced jquery.idle-timer.js vendored asset with bower package #5310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
215fc1c
Replaced jquery.idle-timer.js vendored asset with a bower package #5194
strivedi183 Oct 8, 2014
fce9574
Update jquery.idle-timer.js from 0.9.3 to 1.0.1 #5194
strivedi183 Oct 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Expand Up @@ -86,6 +86,7 @@ gem 'rails-assets-punycode', '1.3.1'

# jQuery plugins

gem 'rails-assets-jquery-idletimer', '1.0.1'
gem 'rails-assets-jquery-placeholder', '2.0.8'
gem 'rails-assets-jquery-textchange', '0.2.3'
gem 'rails-assets-perfect-scrollbar', '0.4.11'
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -357,6 +357,7 @@ GEM
railties (= 4.1.6)
sprockets-rails (~> 2.0)
rails-assets-jquery (1.11.1)
rails-assets-jquery-idletimer (1.0.1)
rails-assets-jquery-placeholder (2.0.8)
rails-assets-jquery-textchange (0.2.3)
rails-assets-jquery
Expand Down Expand Up @@ -577,6 +578,7 @@ DEPENDENCIES
rack-ssl (= 1.4.1)
rails (= 4.1.6)
rails-assets-jquery (= 1.11.1)
rails-assets-jquery-idletimer (= 1.0.1)
rails-assets-jquery-placeholder (= 2.0.8)
rails-assets-jquery-textchange (= 0.2.3)
rails-assets-perfect-scrollbar (= 0.4.11)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/main.js
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
//= require jquery.events.input
//= require jquery.elastic
//= require jquery.mentionsInput
//= require jquery.idle-timer
//= require jquery-idletimer/dist/idle-timer
//= require jquery.infinitescroll-custom
//= require jquery.autocomplete-custom
//= require keycodes
Expand Down
246 changes: 0 additions & 246 deletions vendor/assets/javascripts/jquery.idle-timer.js
View file
Open in desktop

This file was deleted.