Remove unused gem and add a comment where it was replaced

diff --git a/Gemfile b/Gemfile
index 2407a9fdd134254d1deb8f5f5f09d6c298c9bca5..ad2f04c29feb32f232178d13a5a9012a490de45a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -29,9 +29,6 @@ gem 'i18n-js', '>= 3.0.0.rc2'
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'
 

-# Browser detection support
-gem 'browser'
-

 # Markdown formatting support
 gem 'redcarpet'
 
 # Markdown formatting support
 gem 'redcarpet'
 

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a16252f746cae24ea3c437174f78613b76f3226..1ec7948d14a67411e68d19c1af81543bfdcfc026 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,6 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)

-    browser (0.1.4)

     builder (3.0.0)
     cocaine (0.2.1)
     coffee-rails (3.2.2)
     builder (3.0.0)
     cocaine (0.2.1)
     coffee-rails (3.2.2)


@@ -163,7 +162,6 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal

-  browser

   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.8)
   deadlock_retry (>= 1.2.0)
   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.8)
   deadlock_retry (>= 1.2.0)

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index fef09aada9ddaf9f1ba36c6b5f1ca6f96b8263e0..d67f0447703d3b5c0d2d69b7ba1ee530b52e13e6 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -225,6 +225,11 @@ function loadData(url, reload) {
 
     if (browseDataLayer) browseDataLayer.destroyFeatures();
 
 
     if (browseDataLayer) browseDataLayer.destroyFeatures();
 

+    /*
+     * Modern browsers are quite happy showing far more than 100 features in
+     * the data browser, so increase the limit to 2000 by default, but keep
+     * it restricted to 500 for IE8 and 100 for older IEs.
+     */

     var maxFeatures = 2000;
 
     /*@cc_on
     var maxFeatures = 2000;
 
     /*@cc_on