Merge pull request #127 from lepo-project/easier-ui-for-highlight

🆙 bundle update
lepo-project · Feb 5, 2018 · 8926164 · 8926164
2 parents e02c6ea + 4483fdd
commit 8926164
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 34 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ git_source(:github) do |repo_name|
 end
 
 gem 'autosize', '~> 2.4'
-gem 'bootstrap', '~> 4.0.0.beta'
+gem 'bootstrap', '~> 4.0.0'
 # gem "chartkick"
 gem 'coffee-rails', '~> 4.2.0'
 gem 'combine_pdf', '~> 1.0.7'
@@ -15,10 +15,10 @@ gem 'http_accept_language', '~> 2.1.0'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem 'jbuilder', '~> 2.5'
 gem 'jquery-hotkeys-rails', '~> 0.7.9'
-gem 'jquery-rails', '~> 4.2.0'
+gem 'jquery-rails', '~> 4.3.0'
 gem 'jquery-ui-rails', '~> 6.0.0'
 gem 'net-ldap', '~> 0.16.0'
-gem 'paperclip', '~> 5.1.0'
+gem 'paperclip', '~> 5.2.0'
 gem 'pdfjs_viewer-rails', '~> 0.2.8', github: 'lepo-project/pdfjs_viewer-rails'
 gem 'rails', '~> 5.0.4'
 gem 'rails-assets-tether', '~> 1.1'
@@ -55,7 +55,7 @@ group :development do
 end
 
 group :test do
-  gem 'capybara', '~> 2.16.0'
+  gem 'capybara', '~> 2.17.0'
   gem 'chromedriver-helper'
   gem 'database_cleaner', '~> 1.6.0'
   gem 'factory_bot_rails', '~> 4.8'
@@ -68,5 +68,5 @@ group :production do
   # Use Puma as the app server
   # gem 'puma', '~> 3.0'
   # Use Unicorn as the app server
-  gem 'unicorn', '~> 5.2.0'
+  gem 'unicorn', '~> 5.4.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -52,32 +52,32 @@ GEM
     annotate (2.7.2)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
-    archive-zip (0.7.0)
+    archive-zip (0.11.0)
       io-like (~> 0.3.0)
     arel (7.1.4)
-    ast (2.3.0)
+    ast (2.4.0)
     autoprefixer-rails (7.2.5)
       execjs
     autosize (2.4.0.0)
     bindex (0.5.0)
-    bootstrap (4.0.0.beta3)
+    bootstrap (4.0.0)
       autoprefixer-rails (>= 6.0.3)
-      popper_js (>= 1.12.3, < 2)
+      popper_js (>= 1.12.9, < 2)
       sass (>= 3.5.2)
     builder (3.2.3)
-    byebug (9.1.0)
-    capybara (2.16.1)
+    byebug (10.0.0)
+    capybara (2.17.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
     childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
-    chromedriver-helper (1.1.0)
-      archive-zip (~> 0.7.0)
-      nokogiri (~> 1.6)
+    chromedriver-helper (1.2.0)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
@@ -88,7 +88,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    combine_pdf (1.0.7)
+    combine_pdf (1.0.8)
       ruby-rc4 (>= 0.1.5)
     concurrent-ruby (1.0.5)
     crass (1.0.3)
@@ -110,21 +110,21 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http_accept_language (2.1.1)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     i18n_generators (2.1.1)
       rails (>= 3.0.0)
     io-like (0.3.0)
     jquery-hotkeys-rails (0.7.9.1)
       railties (>= 3.1)
-    jquery-rails (4.2.2)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (2.1.0)
-    kgio (2.11.1)
+    kgio (2.11.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -141,7 +141,7 @@ GEM
     mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    minitest (5.11.3)
     minitest-capybara (0.8.2)
       capybara (~> 2.2)
       minitest (~> 5.0)
@@ -150,9 +150,9 @@ GEM
     net-ldap (0.16.1)
     netrc (0.11.0)
     nio4r (2.2.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    paperclip (5.1.0)
+    paperclip (5.2.1)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
@@ -164,7 +164,7 @@ GEM
     popper_js (1.12.9)
     powerpack (0.1.1)
     public_suffix (3.0.1)
-    rack (2.0.3)
+    rack (2.0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.6)
@@ -248,15 +248,15 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
-    unicorn (5.2.0)
+    unicorn (5.4.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     web-console (3.5.1)
@@ -267,18 +267,18 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   annotate (~> 2.7.0)
   autosize (~> 2.4)
-  bootstrap (~> 4.0.0.beta)
+  bootstrap (~> 4.0.0)
   byebug
-  capybara (~> 2.16.0)
+  capybara (~> 2.17.0)
   chromedriver-helper
   coffee-rails (~> 4.2.0)
   combine_pdf (~> 1.0.7)
@@ -288,13 +288,13 @@ DEPENDENCIES
   http_accept_language (~> 2.1.0)
   i18n_generators (~> 2.1)
   jquery-hotkeys-rails (~> 0.7.9)
-  jquery-rails (~> 4.2.0)
+  jquery-rails (~> 4.3.0)
   jquery-ui-rails (~> 6.0.0)
   listen (~> 3.1.0)
   minitest-capybara
   mysql2 (~> 0.4.0)
   net-ldap (~> 0.16.0)
-  paperclip (~> 5.1.0)
+  paperclip (~> 5.2.0)
   pdfjs_viewer-rails (~> 0.2.8)!
   rails (~> 5.0.4)
   rails-assets-tether (~> 1.1)
@@ -309,7 +309,7 @@ DEPENDENCIES
   spring-watcher-listen (~> 2.0.0)
   sqlite3 (~> 1.3.0)
   uglifier (~> 3.2.0)
-  unicorn (~> 5.2.0)
+  unicorn (~> 5.4.0)
   web-console (>= 3.5.0)
 
 BUNDLED WITH

diff --git a/app/views/layouts/_page_viewer.html.erb b/app/views/layouts/_page_viewer.html.erb
@@ -8,11 +8,14 @@
 <script>
 document.getElementById('page-frame').onload = function(e){
 	this.style.opacity = 1;
+	var iframeWin = this.contentWindow
+	var iframeDoc = iframeWin.document
+
 	// Make keyBinder to work even when clicking the content in the iframe
-	keyBinder($(this.contentWindow));
+	keyBinder($(iframeWin));
 
 	<% if @course %>
-	addHighlight($(this.contentWindow), this.contentWindow, "<%= Rails.application.config.relative_url_root %>");
+	addHighlight($(iframeDoc), iframeDoc, "<%= Rails.application.config.relative_url_root %>");
 	<% case pg['file_type'] when 'pdf' %>
 	// Show highlight color even while text is selecting
 	$(this.contentDocument).find("head").append($('<style>#pdfjs_viewer-minimal *::selection {background-color: #fe0;} #pdfjs_viewer-minimal *::-moz-selection {background-color: #fe0;}</style>'))