Fixes for browsermedia#599 and browsermedia#625

Author: peakpg

Gemfile

@@ -17,6 +17,7 @@ end
 
 group :development do
   gem 'rake'
+  gem 'debugger'
 end
 group :test, :development do
   gem 'minitest'

Gemfile.lock

@@ -6,7 +6,8 @@ PATH
       ancestry (~> 2.0.0)
       bootstrap-sass
       ckeditor_rails (~> 4.0.1.1)
-      jquery-rails (~> 2.0)
+      jquery-rails (~> 3.0.4)
+      jquery-ui-rails (~> 4.0.5)
       panoramic
       paperclip (~> 3.5.1)
       rails (~> 4.0.0)
@@ -71,8 +72,9 @@ GEM
       railties (>= 3.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.2)
       climate_control (>= 0.0.3, < 1.0)
+    columnize (0.3.6)
     cucumber (1.3.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -85,6 +87,12 @@ GEM
       nokogiri (>= 1.5.0)
     daemons (1.1.9)
     database_cleaner (1.1.1)
+    debugger (1.6.2)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     eventmachine (1.0.3)
@@ -104,9 +112,11 @@ GEM
     hike (1.2.3)
     http_parser.rb (0.5.3)
     i18n (0.6.5)
-    jquery-rails (2.3.0)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.0.5)
+      railties (>= 3.1.0)
     launchy (2.3.0)
       addressable (~> 2.3)
     m (1.3.2)
@@ -170,14 +180,14 @@ GEM
     rspec-expectations (2.14.1)
       diff-lcs (>= 1.1.3, < 2.0)
     ruby-prof (0.13.0)
-    sass (3.2.10)
+    sass (3.2.12)
     sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    simple_form (3.0.0.rc)
-      actionpack (>= 4.0.0.rc1, < 4.1)
-      activemodel (>= 4.0.0.rc1, < 4.1)
+    simple_form (3.0.0)
+      actionpack (>= 4.0.0, < 4.1)
+      activemodel (>= 4.0.0, < 4.1)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -200,16 +210,16 @@ GEM
     thread_safe (0.1.2)
       atomic
     tilt (1.4.1)
-    tins (0.9.0)
+    tins (0.11.0)
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
     uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    underscore-rails (1.5.1)
-    will_paginate (3.0.4)
+    underscore-rails (1.5.2)
+    will_paginate (3.0.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yard (0.8.7)
@@ -225,6 +235,7 @@ DEPENDENCIES
   cucumber
   cucumber-rails
   database_cleaner
+  debugger
   factory_girl_rails (= 3.3.0)
   launchy
   m (~> 1.2)

app/assets/javascripts/cms/application.js

@@ -2,10 +2,11 @@
 //  Javascript libraries required for the Admin area of the CMS.
 //
 //= require jquery
-//= require jquery-ui
+//= require jquery_ujs
 //= require jquery.cookie
 //= require jquery.selectbox
 //= require jquery.taglist
+//= require jquery.ui.all
 //= require cms/core_library
 //= require cms/attachment_manager
 //= require cms/form_builder

app/assets/javascripts/cms/page_toolbar.js

@@ -2,7 +2,7 @@
 //  Required javascript for editing pages. Similar to toolbar.js, but adds additional features.
 //
 //= require jquery
-//= require jquery-ui
+//= require jquery.ui.all
 //= require jquery.cookie
 //= require jquery.selectbox
 //= require jquery.taglist

app/assets/javascripts/cms/sitemap.js

@@ -1,5 +1,5 @@
 //= require 'jquery'
-//= require 'jquery-ui'
+//= require 'jquery.ui.all'
 //= require 'jquery.cookie'
 //= require 'bootstrap'
 //= require 'cms/ajax'

app/assets/javascripts/cms/toolbar.js

@@ -1,7 +1,7 @@
 //
 //  A manifest file for all CMS toolbar related js.
 //= require jquery
-//= require jquery-ui
+//= require jquery.ui.all
 //= require jquery.cookie
 //= require jquery.selectbox
 //= require jquery.taglist

app/assets/stylesheets/cms/application.css.scss

@@ -3,5 +3,6 @@
 *
 *= require cms/bootstrap-customizations
 *= require cms/sitemap
+*= require jquery.ui.all
 *
-*/
+*/

app/helpers/cms/application_helper.rb

@@ -60,11 +60,11 @@ def check_uncheck_tag(selector)
         html = <<HTML
 jQuery(function($) {
   $('a##{check_id}').click(function() {
-    $('#{selector}').attr('checked', true);
+    $('#{selector}').prop('checked', true);
   });
 
   $('a##{uncheck_id}').click(function() {
-    $('#{selector}').attr('checked', false);
+    $('#{selector}').prop('checked', false);
   });
 })
 HTML

app/views/layouts/cms/login.html.erb

@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <title><%= page_title %></title>
     <%= stylesheet_link_tag 'cms/application', 'cms/load_bootstrap', 'cms/bootstrap_corrections' %>
-  <%= javascript_include_tag 'jquery', 'jquery-ui', 'jquery.cookie.js' %>
+  <%= javascript_include_tag 'jquery', 'jquery.ui.all', 'jquery.cookie.js' %>
   <%= javascript_include_tag 'cms/application' %>
   <%= csrf_meta_tags %>
 

browsercms.gemspec

@@ -36,7 +36,8 @@ Gem::Specification.new do |s|
   s.add_dependency("ancestry", "~> 2.0.0")
   s.add_dependency("ckeditor_rails", "~> 4.0.1.1")
   s.add_dependency("underscore-rails", "~> 1.4")
-  s.add_dependency("jquery-rails", "~> 2.0")
+  s.add_dependency("jquery-rails", "~> 3.0.4")
+  s.add_dependency("jquery-ui-rails", "~> 4.0.5")
   s.add_dependency("paperclip", "~> 3.5.1")
   s.add_dependency("panoramic")
   s.add_dependency("will_paginate", "~>3.0.0")

lib/cms/engine.rb

@@ -13,6 +13,7 @@
 # Explicitly require this, so that CMS projects do not need to add it to their Gemfile
 # especially while upgrading
 require 'jquery-rails'
+require 'jquery-ui-rails'
 
 require 'underscore-rails'
 require 'will_paginate'