Update jquery-rails and add jquery-ui-rails gem

Gemfile.lock

@@ -8,7 +8,8 @@ PATH
       compass-rails
       haml
       i18n (~> 0.6)
-      jquery-rails (~> 2.2.1)
+      jquery-rails (~> 3.1.4)
+      jquery-ui-rails
       json
       maruku (= 0.6.1)
       opencpu (~> 0.9.0)
@@ -74,7 +75,7 @@ GEM
       launchy
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.6)
+    chunky_png (1.3.7)
     codeclimate-test-reporter (0.3.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
@@ -151,9 +152,11 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
     ice_nine (0.11.2)
-    jquery-rails (2.2.2)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
     json (1.8.3)
     launchy (2.4.2)
       addressable (~> 2.3)

Guardfile

@@ -31,7 +31,7 @@ guard :teaspoon, teaspoon_options do
 end
 
 guard :rubocop, all_on_start: false, cli: ['-D'] do
-  excludes = YAML.load_file('.rubocop.yml')['AllCops']['Excludes']
+  excludes = YAML.load_file('.rubocop.yml')['AllCops']['Exclude']
   watch(%r{(.+\.rb)$}) { |m| m[0] unless excludes.find { |excluded| File.fnmatch(excluded, m[0]) } }
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

app/assets/javascripts/quby/answers/hotkeys.js

@@ -154,7 +154,7 @@
           $(this).dialog("close");
         }
       }
-    });
+    }).dialog({position: {my: 'center top', at: 'center', of: $('#content')}}); // center dialog fix
   };
 
   function handleDownHotKeys(event){

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

@@ -15,7 +15,7 @@ $masthead_bg: #0f72a4;
 @import "partials/text.scss";
 @import "screen";
 @import "table/layout";
-@import "redmond/jquery-ui-1.8.7.custom";
+@import "redmond/jquery-ui-1.11.4.custom";
 
 // display modes
 @import "paged";

gemfiles/rails40.gemfile.lock

@@ -8,7 +8,8 @@ PATH
       compass-rails
       haml
       i18n (~> 0.6)
-      jquery-rails (~> 2.2.1)
+      jquery-rails (~> 3.1.4)
+      jquery-ui-rails
       json
       maruku (= 0.6.1)
       opencpu (~> 0.9.0)
@@ -148,10 +149,12 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
     ice_nine (0.11.2)
-    jquery-rails (2.2.2)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
+    json (2.0.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.15)

gemfiles/rails41.gemfile.lock

@@ -8,7 +8,8 @@ PATH
       compass-rails
       haml
       i18n (~> 0.6)
-      jquery-rails (~> 2.2.1)
+      jquery-rails (~> 3.1.4)
+      jquery-ui-rails
       json
       maruku (= 0.6.1)
       opencpu (~> 0.9.0)
@@ -150,9 +151,11 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
     ice_nine (0.11.2)
-    jquery-rails (2.2.2)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)

gemfiles/rails42.gemfile.lock

@@ -8,7 +8,8 @@ PATH
       compass-rails
       haml
       i18n (~> 0.6)
-      jquery-rails (~> 2.2.1)
+      jquery-rails (~> 3.1.4)
+      jquery-ui-rails
       json
       maruku (= 0.6.1)
       opencpu (~> 0.9.0)
@@ -161,9 +162,11 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
     ice_nine (0.11.2)
-    jquery-rails (2.2.2)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)

lib/quby/engine.rb

@@ -7,6 +7,7 @@
 require 'compass'
 require 'compass-rails'
 require 'jquery-rails'
+require 'jquery-ui-rails'
 require 'susy'
 require 'andand'
 require 'quby/lookup_table'

quby.gemspec

@@ -39,7 +39,8 @@ Gem::Specification.new do |s|
   s.add_dependency "virtus", ">= 1.0.3", "< 2.0"
   s.add_dependency "i18n", "~> 0.6"
 
-  s.add_dependency "jquery-rails", "~> 2.2.1"
+  s.add_dependency "jquery-rails", "~> 3.1.4"
+  s.add_dependency "jquery-ui-rails"
 
   s.add_development_dependency 'combustion',       '~> 0.5.1'
   s.add_development_dependency 'rspec-rails',      '~> 2.14.0'

spec/features/external_links_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+feature 'External links' do
+  let(:test_page_url) do
+    "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}/test.html"
+  end
+
+  let(:questionnaire) do
+    inject_questionnaire("test", <<-END)
+        allow_hotkeys :all
+        panel do
+        question :v1, type: :radio, required: true, deselectable: true do
+          option :a1, value: 1, description: "~~#{test_page_url}~~Testpage~~"
+          option :a2, value: 2, description: "Nee"
+        end;
+        end; end_panel
+    END
+  end
+
+  scenario 'show page in modal window when link is clicked', js: true do
+    visit_new_answer_for(questionnaire)
+    click_on('Testpage')
+    within_frame('modalFrame') do
+      expect(current_url).to match(test_page_url)
+      expect(page).to have_content('TESTING')
+    end
+  end
+end

spec/features/hotkeys_spec.rb

@@ -60,4 +60,17 @@
     page.driver.execute_script(keypress_1)
     page.should have_checked_field("answer_v1_a1")
   end
+
+  scenario 'show and close hotkeys dialog when help link is clicked', js: true do
+    visit_new_answer_for(questionnaire)
+
+    page.should have_content('Sneltoetsen Help')
+    page.should_not have_content('Gebruik de volgende toetsen')
+
+    page.click_link('Sneltoetsen Help')
+    page.should have_content('Gebruik de volgende toetsen')
+
+    page.find('button', text: 'Sluiten').trigger('click')
+    page.should_not have_content('Gebruik de volgende toetsen')
+  end
 end

spec/internal/public/test.html

@@ -0,0 +1 @@
+TESTING