From 2e349ab51a61bc9b4685bd8ae16735ad2e73ea26 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Sat, 25 Aug 2012 19:30:51 -0700 Subject: [PATCH 1/1] Remove unused gem and add a comment where it was replaced --- Gemfile | 3 --- Gemfile.lock | 2 -- app/assets/javascripts/browse.js | 5 +++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 2407a9fdd..ad2f04c29 100644 --- 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' -# Browser detection support -gem 'browser' - # Markdown formatting support gem 'redcarpet' diff --git a/Gemfile.lock b/Gemfile.lock index 2a16252f7..1ec7948d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,7 +31,6 @@ GEM 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) @@ -163,7 +162,6 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) bigdecimal - browser 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 fef09aada..d67f04477 100644 --- a/app/assets/javascripts/browse.js +++ b/app/assets/javascripts/browse.js @@ -225,6 +225,11 @@ function loadData(url, reload) { 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 -- 2.43.2