Update jquery-rails and jquey-ui

4 files changed, 14 insertions, 19 deletions

diff --git a/Gemfile b/Gemfile
index b1ce8e89f..e3b74e3bc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,13 +6,12 @@ gem 'rails', '~> 4.1.10'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.3'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '~> 2.7.2'
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails', '~> 4.0.0'
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
-gem 'jquery-ui-sass-rails'
+gem 'jquery-rails', '~> 3.1.4' # Update to v4 for Rails 4.2
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -162,4 +161,5 @@ source 'http://rails-assets.org' do
   gem 'rails-assets-jquery-tokeninput', '~> 1.7.0'
 
   gem 'rails-assets-modernizr', '~> 2.0.6'
+  gem 'rails-assets-jquery-ui', '~> 1.11.4'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 4d6ccb800..ea4a0cba6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,7 +137,7 @@ GEM
     enumerize (0.10.1)
       activesupport (>= 3.2)
     erubis (2.7.0)
-    execjs (2.4.0)
+    execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
@@ -202,16 +202,9 @@ GEM
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jdbc-postgres (9.4.1200)
-    jquery-rails (3.1.2)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.3)
-      jquery-rails
-      railties (>= 3.1.0)
-    jquery-ui-sass-rails (4.0.3.0)
-      jquery-rails
-      jquery-ui-rails (= 4.0.3)
-      railties (>= 3.1.0)
     jruby-jars (1.7.19)
     jruby-openssl (0.9.7-java)
     jruby-rack (1.1.18)
@@ -290,7 +283,7 @@ GEM
       railties (>= 3.1, < 5.0)
     rabl (0.11.6)
       activesupport (>= 2.3.14)
-    rack (1.5.3)
+    rack (1.5.5)
     rack-contrib (1.2.0)
       rack (>= 0.9.1)
     rack-test (0.6.3)
@@ -318,6 +311,8 @@ GEM
     rails-assets-jquery (2.1.4)
     rails-assets-jquery-tokeninput (1.7.0)
       rails-assets-jquery (>= 1.5)
+    rails-assets-jquery-ui (1.11.4)
+      rails-assets-jquery (>= 1.6)
     rails-assets-mocha (1.17.1)
     rails-assets-modernizr (2.0.6)
     rails-assets-moment (2.10.3)
@@ -457,7 +452,7 @@ GEM
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     warbler (1.4.5)
@@ -519,8 +514,7 @@ DEPENDENCIES
   guard-rspec
   inherited_resources
   jbuilder (~> 2.0)
-  jquery-rails
-  jquery-ui-sass-rails
+  jquery-rails (~> 3.1.4)
   jruby-openssl
   jruby-rack-worker
   json
@@ -542,6 +536,7 @@ DEPENDENCIES
   rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3)!
   rails-assets-footable (~> 2.0.3)!
   rails-assets-jquery-tokeninput (~> 1.7.0)!
+  rails-assets-jquery-ui (~> 1.11.4)!
   rails-assets-modernizr (~> 2.0.6)!
   rails-assets-morrisjs (~> 0.5.1)!
   rails-assets-raphael (~> 2.1.3)!
@@ -570,7 +565,7 @@ DEPENDENCIES
   therubyrhino
   transpec
   turbolinks
-  uglifier (>= 1.3.0)
+  uglifier (~> 2.7.2)
   warbler
   will_paginate (~> 3.0.7)
   will_paginate-bootstrap (~> 1.0.1)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1ae76cd05..7193d0d21 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -6,7 +6,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery.ui.all
+//= require jquery-ui
 //= require modernizr
 //= require cocoon
 //= require raphael
diff --git a/app/assets/stylesheets/application.scss.erb b/app/assets/stylesheets/application.scss.erb
index 770e3c82b..dab6ff320 100644
--- a/app/assets/stylesheets/application.scss.erb
+++ b/app/assets/stylesheets/application.scss.erb
@@ -25,7 +25,7 @@ $body-bg: #eee;
 @import "tagmanager/tagmanager";
 @import "font-awesome-sprockets";
 @import "font-awesome";
-@import "jquery.ui.all";
+@import "jquery-ui";
 @import "morrisjs";
 @import "formtastic";
 @import 'eonasdan-bootstrap-datetimepicker';