blacklight_range_limit 7.5.0 → 7.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7193a46aebab2a5537bd404162533d288a54f1817122a2207aaad88265245136
-  data.tar.gz: ca8afcd5b456dbb7a769a3169b405f63f37cd0003a41d905749072726a74110d
+  metadata.gz: c9c6a258b341059e6b61badb2323850e57033bc29d6f03abadfd91e0a34afcf3
+  data.tar.gz: 8b3840c1990d7ff721c165104c0be7e585a708008dbebc093e46862a2cf8bf1a
 SHA512:
-  metadata.gz: 70f3f8ac356959bd04dadd3f998e5a5551dd3f2cbb4efb0f5e1ebc35783fb0a579739a4ffd4184188ebf2b195906443da54d828fc393ff8f01bbc16382aba5f8
-  data.tar.gz: 9794d80970199368df6f9f6ce84544d6d88a392b8de7e59195e6402857d94462a82fe38cd46c88ee7a9b8bf0ae3abc208de4c6c26f0a8c033e6ebe1cfbbc9efb
+  metadata.gz: 9a465799fe33e06c3ba6655dd55426cdc97b363f0ee7783ce71a9ea61a20767ae65b80020af0c84c39661b57546f682eb75fd7c79927bbfebd6eac78d3e409ce
+  data.tar.gz: 8fe559ef62f817a76d494f4839ccf22caf85478a5e55bcf7b9e3210842b26c900824d7bcbd952b4474abe4885ab0f6328f5a70741ef359bb7a08ef6dd72c5bc3

data/.travis.yml

@@ -1,4 +1,4 @@
-dist: trusty
+dist: bionic
 language: ruby
 addons:
   chrome: stable

data/README.md

@@ -52,7 +52,7 @@ config.add_facet_field 'pub_date', label: 'Publication Year', range: true
 You should now get range limit display. More complicated configuration is available if desired, see Range Facet Configuration below.
 
 
-You can also configure the look and feel of the Flot chart using the jQuery .data() method. On the `.facet_limit` container you want to configure, add a Flot options associative array (documented at http://people.iola.dk/olau/flot/API.txt) as the `plot-config` key. The `plot-config` key to set the `plot-config` key on the appropriate `.facet_limit` container. In order to customize the plot colors, for example, you could use this code:
+You can also configure the look and feel of the Flot chart using the jQuery .data() method. On the `.blrl-plot-config` or `.facet-limit` container you want to configure, add a Flot options associative array (documented at http://people.iola.dk/olau/flot/API.txt) as the `plot-config` key. The `plot-config` key to set the `plot-config` key on the appropriate `.blrl-plot-config` or `.facet-limit` container. In order to customize the plot colors, for example, you could use this code:
 
 ```javascript
 $('.blacklight-year_i').data('plot-config', {

data/VERSION

@@ -1 +1 @@
-7.5.0
+7.8.2

data/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js

@@ -166,12 +166,12 @@ Blacklight.onLoad(function() {
         var series_data = new Array();
         var pointer_lookup = new Array();
         var x_ticks = new Array();
-        var min = BlacklightRangeLimit.parseNum($(container).find("ul li:first-child span.from").text());
-        var max = BlacklightRangeLimit.parseNum($(container).find("ul li:last-child span.to").text());
+        var min = BlacklightRangeLimit.parseNum($(container).find("ul li:first-child span.from").first().data('blrlBegin'));
+        var max = BlacklightRangeLimit.parseNum($(container).find("ul li:last-child span.to").first().data('blrlEnd'));
 
         $(container).find("ul li").each(function() {
-            var from = BlacklightRangeLimit.parseNum($(this).find("span.from").text());
-            var to = BlacklightRangeLimit.parseNum($(this).find("span.to").text());
+            var from = BlacklightRangeLimit.parseNum($(this).find("span.from").first().data('blrlBegin'));
+            var to = BlacklightRangeLimit.parseNum($(this).find("span.to").first().data('blrlEnd'));
             var count = BlacklightRangeLimit.parseNum($(this).find("span.count").text());
             var avg = (count / (to - from + 1));
 
@@ -191,7 +191,7 @@ Blacklight.onLoad(function() {
 
 
         var plot;
-        var config = $(container).closest('.facet_limit').data('plot-config') || {};
+        var config = $(container).closest('.blrl-plot-config').data('plot-config') || $(container).closest('.facet-limit').data('plot-config') || {};
 
         try {
           plot = $.plot($(container), [series_data],

data/app/assets/javascripts/blacklight_range_limit/range_limit_slider.js

@@ -33,10 +33,10 @@ function min_max(range_element) {
    
    
    
-   var min = max = BlacklightRangeLimit.parseNum(current_limit.find(".single").text())
+   var min = max = BlacklightRangeLimit.parseNum(current_limit.find(".single").data('blrlSingle'))
    if ( isNaN(min)) {
-     min = BlacklightRangeLimit.parseNum(current_limit.find(".from").first().text());
-     max = BlacklightRangeLimit.parseNum(current_limit.find(".to").first().text());
+     min = BlacklightRangeLimit.parseNum(current_limit.find(".from").first().data('blrlBegin'));
+     max = BlacklightRangeLimit.parseNum(current_limit.find(".to").first().data('blrlEnd'));
    }
   
    if (isNaN(min) || isNaN(max)) {
@@ -44,7 +44,6 @@ function min_max(range_element) {
       min = BlacklightRangeLimit.parseNum($(range_element).find(".min").first().text());
       max = BlacklightRangeLimit.parseNum($(range_element).find(".max").first().text());
    }
-   
    return [min, max]
 }
 

data/app/helpers/range_limit_helper.rb

@@ -42,13 +42,30 @@ module RangeLimitHelper
       return t('blacklight.range_limit.missing')
     elsif hash["begin"] || hash["end"]
       if hash["begin"] == hash["end"]
-        return t('blacklight.range_limit.single_html', begin: h(hash['begin']))
+        return t(
+          'blacklight.range_limit.single_html',
+          begin: format_range_display_value(hash['begin'], solr_field),
+          begin_value: hash['begin']
+        )
       else
-        return t('blacklight.range_limit.range_html', begin: h(hash['begin']), end: h(hash['end']))
+        return t(
+          'blacklight.range_limit.range_html',
+          begin: format_range_display_value(hash['begin'], solr_field),
+          begin_value: hash['begin'],
+          end: format_range_display_value(hash['end'], solr_field),
+          end_value: hash['end']
+        )
       end
     end
 
-    return ""
+    ''
+  end
+
+  ##
+  # A method that is meant to be overridden downstream to format how a range
+  # label might be displayed to a user. By default it just returns the value.
+  def format_range_display_value(value, _solr_field)
+    value
   end
 
   # Show the limit area if:

data/app/views/blacklight_range_limit/_range_limit_panel.html.erb

@@ -7,7 +7,7 @@
   maxlength = field_config[:maxlength]
 -%>
 
-<div class="limit_content range_limit">
+<div class="limit_content range_limit <%= field_name %>-config blrl-plot-config">
   <% if has_selected_range_limit?(field_name) %>
     <ul class="current list-unstyled facet-values">
       <li class="selected">

data/app/views/blacklight_range_limit/_range_segments.html.erb

@@ -7,8 +7,10 @@
         <span class="facet-label">
             <%= link_to(
                   t('blacklight.range_limit.range_html',
-                  begin: facet_display_value(solr_field, hash[:from]),
-                  end: facet_display_value(solr_field, hash[:to])),
+                  begin: format_range_display_value(facet_display_value(solr_field, hash[:from]), solr_field),
+                  begin_value: facet_display_value(solr_field, hash[:from]),
+                  end: format_range_display_value(facet_display_value(solr_field, hash[:to]), solr_field),
+                  end_value: facet_display_value(solr_field, hash[:to])),
                   search_action_url(add_range(solr_field, hash[:from], hash[:to]).except(:controller, :action)),
                   class: 'facet_select'
               ) %>

data/config/locales/blacklight_range_limit.ar.yml

@@ -9,5 +9,5 @@ ar:
       view_distribution: 'عرض التوزيع'
       view_larger: 'عرض بحجم أكبر »'
       results_range_html: 'تمتد النتائج الحالية من <span class="min">%{min}</span> إلى<span class="max">%{max}</span>'
-      single_html: '<span class="single">%{begin}</span>'
-      range_html: '<span class="from">%{begin}</span> إلى<span class="to">%{end}</span>'
+      single_html: '<span class="single" data-blrl-single="%{begin_value}">%{begin}</span>'
+      range_html: '<span class="from" data-blrl-begin="%{begin_value}">%{begin}</span> الى <span class="to" data-blrl-end="%{end_value}">%{end}</span>'

data/config/locales/blacklight_range_limit.en.yml

@@ -9,5 +9,5 @@ en:
       view_distribution: 'View distribution'
       view_larger: 'View larger »'
       results_range_html: 'Current results range from <span class="min">%{min}</span> to <span class="max">%{max}</span>'
-      single_html: '<span class="single">%{begin}</span>'
-      range_html: '<span class="from">%{begin}</span> to <span class="to">%{end}</span>'
+      single_html: '<span class="single" data-blrl-single="%{begin_value}">%{begin}</span>'
+      range_html: '<span class="from" data-blrl-begin="%{begin_value}">%{begin}</span> to <span class="to" data-blrl-end="%{end_value}">%{end}</span>'

data/lib/blacklight_range_limit/range_limit_builder.rb

@@ -23,6 +23,8 @@ module BlacklightRangeLimit
         solr_params["stats.field"] ||= []
         solr_params["stats.field"] << config.field
 
+        range_config = BlacklightRangeLimit.range_config(blacklight_config, config.field)
+
         hash =  blacklight_params["range"] && blacklight_params["range"][field_key] ?
           blacklight_params["range"][field_key] :
           {}
@@ -40,13 +42,13 @@ module BlacklightRangeLimit
           solr_params[:fq] ||= []
           solr_params[:fq] << "#{config.field}: [#{start} TO #{finish}]"
 
-          if (config.segments != false && start != "*" && finish != "*")
+          if (range_config[:segments] != false && start != "*" && finish != "*")
             # Add in our calculated segments, can only do with both boundaries.
             add_range_segments_to_solr!(solr_params, field_key, start.to_i, finish.to_i)
           end
 
-        elsif (config.segments != false &&
-               boundaries = config.assumed_boundaries)
+        elsif (range_config[:segments] != false &&
+               boundaries = range_config[:assumed_boundaries])
           # assumed_boundaries in config
           add_range_segments_to_solr!(solr_params, field_key, boundaries[0], boundaries[1])
         end

data/lib/blacklight_range_limit/segment_calculation.rb

@@ -15,6 +15,8 @@ module BlacklightRangeLimit
       raise InvalidRange, "The min date must be before the max date" if min > max
       field_config = blacklight_config.facet_fields[facet_field.to_s]
 
+      return solr_params unless field_config
+
       range_config = BlacklightRangeLimit.range_config(blacklight_config, facet_field)
 
       solr_params[:"facet.query"] ||= []
@@ -29,7 +31,7 @@ module BlacklightRangeLimit
         solr_params[:"facet.query"] << "#{field_config.field}:[#{first} TO #{last}]"
       end
 
-      return solr_params
+      solr_params
     end
 
     # returns an array of 'boundaries' for producing approx num_div

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -29,39 +29,26 @@
     end
 
     def render_constraints_filters(my_params = params)
-      content = super(my_params)
       # add a constraint for ranges?
-      unless my_params[:range].blank?
-        my_params[:range].each_pair do |solr_field, hash|
-
-          next unless hash["missing"] || (!hash["begin"].blank?) || (!hash["end"].blank?)
-          content << render_constraint_element(
-            facet_field_label(solr_field),
-            range_display(solr_field, my_params),
-            :escape_value => false,
-            :remove => remove_range_param(solr_field, my_params)
-          )
-        end
+      range_params(my_params).keys.each_with_object(super) do |solr_field, content|
+        content << render_constraint_element(
+          facet_field_label(solr_field),
+          range_display(solr_field, my_params),
+          escape_value: false,
+          remove: search_action_path(remove_range_param(solr_field, my_params))
+        )
       end
-      return content
     end
 
     def render_search_to_s_filters(my_params)
-      content = super(my_params)
       # add a constraint for ranges?
-      unless my_params[:range].blank?
-        my_params[:range].each_pair do |solr_field, hash|
-          next unless hash["missing"] || (!hash["begin"].blank?) || (! hash["end"].blank?)
-
-          content << render_search_to_s_element(
-            facet_field_label(solr_field),
-            range_display(solr_field, my_params),
-            :escape_value => false
-          )
-
-        end
+      range_params(my_params).keys.each_with_object(super) do |solr_field, content|
+        content << render_search_to_s_element(
+          facet_field_label(solr_field),
+          range_display(solr_field, my_params),
+          escape_value: false
+        )
       end
-      return content
     end
 
     def remove_range_param(solr_field, my_params = params)
@@ -97,4 +84,17 @@
       BlacklightRangeLimit.range_config(blacklight_config, solr_field)
     end
 
+    private
+
+    def range_params(my_params = params)
+      return {} unless my_params[:range].is_a?(ActionController::Parameters) || my_params[:range].is_a?(Hash)
+
+      my_params[:range].select do |_solr_field, range_options|
+        next unless range_options
+
+        [range_options['missing'].presence,
+         range_options['begin'].presence,
+         range_options['end'].presence].any?
+      end
+    end
   end

data/lib/generators/blacklight_range_limit/install_generator.rb

@@ -9,7 +9,7 @@ module BlacklightRangeLimit
     end
 
     def install_catalog_controller_mixin
-      inject_into_class 'app/controllers/catalog_controller.rb', CatalogController do
+      inject_into_file 'app/controllers/catalog_controller.rb', after: /include Blacklight::Catalog.*$/ do
         "\n  include BlacklightRangeLimit::ControllerOverride\n"
       end
     end

data/spec/features/a_javascript_spec.rb

@@ -21,6 +21,25 @@ describe 'JavaScript', js: true do
     end
   end
 
+  context 'when assumed boundaries configured' do
+    before do
+      CatalogController.blacklight_config.facet_fields['pub_date_si'].range = {
+        assumed_boundaries: [1990, 2000]
+      }
+    end
+
+    after do
+      CatalogController.blacklight_config.facet_fields['pub_date_si'].range = true
+    end
+
+    it 'should show the range limit with set boundaries' do
+      visit '/catalog'
+      click_button 'Publication Date Sort'
+      expect(page).to have_field :range_pub_date_si_begin, with: '1990'
+      expect(page).to have_field :range_pub_date_si_end, with: '2000'
+    end
+  end
+
   describe '"Unknown" link' do
     context 'when in the facet (e.g. non-xhr)' do
       it 'is displayed' do

data/spec/features/blacklight_range_limit_spec.rb

@@ -24,7 +24,15 @@ describe "Blacklight Range Limit" do
     click_link 'View distribution'
     click_link '2000 to 2008'
 
-    expect(page).to have_content "2000 to 2008 ✖ [remove] 12"
+    within '.blacklight-pub_date_si' do
+      expect(page).to have_content "2000 to 2008 ✖ [remove] 12"
+    end
+
+    within '.constraints-container'  do
+      expect(page).to have_content '2000 to 2008'
+    end
+
+    expect(page).to have_content '1 - 10 of 12'
   end
 
   it "should not include page parameter" do
@@ -40,6 +48,10 @@ describe "Blacklight Range Limit" do
       I18n.backend.store_translations(:en, blacklight: {search: {fields: {facet: {pub_date_si: 'Publication Date I18n'}}}})
     end
 
+    after do
+      I18n.backend.store_translations(:en, blacklight: {search: {fields: {facet: {pub_date_si: 'Publication Date Sort'}}}})
+    end
+
     it 'should render the I18n label' do
       visit search_catalog_path
       click_link 'View distribution'

data/spec/lib/blacklight_range_limit/segment_calculation_spec.rb

@@ -4,6 +4,10 @@ RSpec.describe BlacklightRangeLimit::SegmentCalculation do
   let(:dummy_class) do
     Class.new do
       include BlacklightRangeLimit::SegmentCalculation
+
+      def blacklight_config
+        Blacklight::Configuration.new
+      end
     end
   end
 
@@ -45,5 +49,15 @@ RSpec.describe BlacklightRangeLimit::SegmentCalculation do
                                           'The min date must be before the max date'
       end
     end
+
+    context 'when a field that does not exist is passed in' do
+      let(:min) { 100 }
+      let(:max) { 800 }
+      let(:solr_field) { 'i_am_not_real' }
+
+      it 'returns the original solr_params (and does not raise an error)' do
+        expect(subject).to eq({})
+      end
+    end
   end
 end

data/spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb

@@ -0,0 +1,132 @@
+require 'spec_helper'
+
+RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
+  describe '#render_constraints_filters' do
+    before do
+      allow(helper).to receive_messages(
+        facet_field_label: 'Date Range',
+        remove_range_param: {},
+        search_action_path: '/catalog',
+        blacklight_config: CatalogController.blacklight_config
+      )
+      allow(controller).to receive_messages(
+        search_state_class: Blacklight::SearchState,
+      )
+    end
+
+    it 'does not return any content when the range parameter invalid' do
+      params = ActionController::Parameters.new(range: 'garbage')
+
+      expect(helper.render_constraints_filters(params)).to eq ''
+    end
+
+    it 'renders a constraint for the given data in the range param' do
+      params = ActionController::Parameters.new(
+        range: { range_field: { 'begin' => 1900, 'end' => 2000 } }
+      )
+      constraints = helper.render_constraints_filters(params)
+
+      expect(constraints).to have_css(
+        '.constraint .filter-name', text: 'Date Range'
+      )
+      expect(constraints).to have_css(
+        '.constraint .filter-value', text: '1900 to 2000'
+      )
+    end
+  end
+
+  describe 'render_search_to_s_filters' do
+    before do
+      allow(helper).to receive_messages(facet_field_label: 'Date Range')
+    end
+
+    it 'does not return any content when the range parameter invalid' do
+      params = ActionController::Parameters.new(range: 'garbage')
+
+      expect(helper.render_search_to_s_filters(params)).to eq ''
+    end
+
+    it 'renders a constraint for the given data in the range param' do
+      params = ActionController::Parameters.new(
+        range: { range_field: { 'begin' => 1900, 'end' => 2000 } }
+      )
+      constraints = helper.render_search_to_s_filters(params)
+
+      expect(constraints).to have_css(
+        '.constraint .filter-name', text: 'Date Range:'
+      )
+      expect(constraints).to have_css(
+        '.constraint .filter-values', text: '1900 to 2000'
+      )
+    end
+  end
+
+  describe '#range_params' do
+    it 'handles no range input' do
+      expect(
+        helper.send(:range_params, ActionController::Parameters.new(q: 'blah'))
+      ).to eq({})
+    end
+
+    it 'handles non-compliant range input' do
+      expect(
+        helper.send(:range_params, ActionController::Parameters.new(range: 'blah'))
+      ).to eq({})
+
+      expect(
+        helper.send(:range_params, ActionController::Parameters.new(range: ['blah']))
+      ).to eq({})
+
+      expect(
+        helper.send(:range_params, ActionController::Parameters.new(range: { 'wrong' => 'data' }))
+      ).to eq({})
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'wrong' => 'data' } })
+        )
+      ).to eq({})
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'begin' => '', 'end' => '' } })
+        )
+      ).to eq({})
+    end
+
+    it 'returns the range parameters that are present' do
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'missing' => true } })
+        ).permit!.to_h
+      ).to eq({ 'field_name' => { 'missing' => true } })
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'begin' => '1800', 'end' => '1900' } })
+        ).permit!.to_h
+      ).to eq({ 'field_name' => { 'begin' => '1800', 'end' => '1900' } })
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(
+            range: {
+              field_name: { 'begin' => '1800', 'end' => '1900' },
+              field_name2: { 'begin' => '1800', 'end' => '1900' }
+            }
+          )
+        ).permit!.to_h
+      ).to eq(
+        {
+          'field_name' => { 'begin' => '1800', 'end' => '1900' },
+          'field_name2' => { 'begin' => '1800', 'end' => '1900' }
+        }
+      )
+    end
+  end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -1,3 +1,2 @@
-gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'master'
 gem 'rails-controller-testing'
 gem 'thor', '~> 0.20'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -30,4 +30,11 @@ class TestAppGenerator < Rails::Generators::Base
       "\n    config.add_facet_field 'pub_date_si', label: 'Publication Date Sort', range: true"
     end
   end
+
+  def assets
+    return if !defined?(Sprockets::VERSION) || Sprockets::VERSION < '4'
+
+    append_to_file 'app/assets/config/manifest.js', "\n//= link application.js"
+    empty_directory 'app/assets/images'
+  end
 end

data/vendor/assets/javascripts/flot/jquery.canvaswrapper.js

@@ -386,7 +386,6 @@ don't work unless the canvas is attached to the DOM.
 
         y += 0.75 * info.height;
 
-
         // Determine whether this text already exists at this position.
         // If so, mark it for inclusion in the next render pass.
 
@@ -447,7 +446,7 @@ don't work unless the canvas is attached to the DOM.
         position.element.style.textAlign = halign;
         // update the transforms
         updateTransforms(position.element, transforms);
-   };
+    };
 
     var addTspanElements = function(text, element, x) {
         var lines = text.split('<br>'),
@@ -461,7 +460,7 @@ don't work unless the canvas is attached to the DOM.
                 tspan = element.childNodes[i];
             }
             tspan.textContent = lines[i];
-            offset = i * 1 + 'em';
+            offset = (i === 0 ? 0 : 1) + 'em';
             tspan.setAttributeNS(null, 'dy', offset);
             tspan.setAttributeNS(null, 'x', x);
         }

data/vendor/assets/javascripts/flot/jquery.flot.drawSeries.js

@@ -42,7 +42,7 @@ This plugin is used by flot for drawing lines, plots, bars or area.
                     continue;
                 }
 
-                if(steps){
+                if (steps) {
                     if (mx !== null && my !== null) {
                         // if middle point exists, transfer p2 -> p1 and p1 -> mp
                         x2 = x1;
@@ -202,7 +202,7 @@ This plugin is used by flot for drawing lines, plots, bars or area.
                     continue;
                 }
 
-                if(steps){
+                if (steps) {
                     if (mx !== null && my !== null) {
                         // if middle point exists, transfer p2 -> p1 and p1 -> mp
                         x2 = x1;
@@ -482,8 +482,7 @@ This plugin is used by flot for drawing lines, plots, bars or area.
                     drawLeft = true;
                     drawRight = false;
                 }
-            }
-            else {
+            } else {
                 drawLeft = drawRight = drawTop = true;
                 drawBottom = false;
                 left = x + barLeft;

data/vendor/assets/javascripts/flot/jquery.flot.hover.js

@@ -79,7 +79,6 @@ the tooltip from webcharts).
             highlights = [];
         }
 
-
         function generatePlothoverEvent(e) {
             var o = plot.getOptions(),
                 newEvent = new CustomEvent('mouseevent');
@@ -98,10 +97,10 @@ the tooltip from webcharts).
 
         function doTriggerClickHoverEvent(event, eventType, searchDistance) {
             var series = plot.getData();
-            if (event !== undefined
-                && series.length > 0
-                && series[0].xaxis.c2p !== undefined
-                && series[0].yaxis.c2p !== undefined) {
+            if (event !== undefined &&
+                series.length > 0 &&
+                series[0].xaxis.c2p !== undefined &&
+                series[0].yaxis.c2p !== undefined) {
                 var eventToTrigger = "plot" + eventType;
                 var seriesFlag = eventType + "able";
                 triggerClickHoverEvent(eventToTrigger, event,
@@ -155,8 +154,8 @@ the tooltip from webcharts).
             var items = plot.findNearbyItems(canvasX, canvasY, seriesFilter, distance);
             var item = items[0];
 
-            for (var i = 1; i < items.length; ++i) {
-                if (item.distance === undefined || 
+            for (let i = 1; i < items.length; ++i) {
+                if (item.distance === undefined ||
                     items[i].distance < item.distance) {
                     item = items[i];
                 }
@@ -172,7 +171,7 @@ the tooltip from webcharts).
 
             if (options.grid.autoHighlight) {
                 // clear auto-highlights
-                for (var i = 0; i < highlights.length; ++i) {
+                for (let i = 0; i < highlights.length; ++i) {
                     var h = highlights[i];
                     if ((h.auto === eventname &&
                         !(item && h.series === item.series &&

data/vendor/assets/javascripts/flot/jquery.flot.js

@@ -847,8 +847,6 @@ Licensed under the MIT license.
                 ps = s.datapoints.pointsize;
                 points = s.datapoints.points;
 
-                var insertSteps = s.lines.show && s.lines.steps;
-
                 for (j = k = 0; j < data.length; ++j, k += ps) {
                     p = data[j];
 
@@ -980,8 +978,8 @@ Licensed under the MIT license.
             var eventList = eventManager[key] || [];
 
             eventList.push({"event": event, "handler": handler, "eventHolder": eventHolder, "priority": priority});
-            eventList.sort((a, b) => b.priority - a.priority );
-            eventList.forEach( eventData => {
+            eventList.sort((a, b) => b.priority - a.priority);
+            eventList.forEach(eventData => {
                 eventData.eventHolder.unbind(eventData.event, eventData.handler);
                 eventData.eventHolder.bind(eventData.event, eventData.handler);
             });
@@ -2437,8 +2435,7 @@ Licensed under the MIT license.
                 if (series.bars.horizontal) {
                     range.ymin += delta;
                     range.ymax += delta + barWidth;
-                }
-                else {
+                } else {
                     range.xmin += delta;
                     range.xmax += delta + barWidth;
                 }
@@ -2467,7 +2464,7 @@ Licensed under the MIT license.
             }
 
             var start = series.bars.horizontal ? 1 : 0;
-            for (var j = start; j < series.datapoints.points.length; j += pointsize) {
+            for (let j = start; j < series.datapoints.points.length; j += pointsize) {
                 if (isFinite(series.datapoints.points[j]) && series.datapoints.points[j] !== null) {
                     xValues.push(series.datapoints.points[j]);
                 }
@@ -2477,10 +2474,10 @@ Licensed under the MIT license.
                 return self.indexOf(value) === index;
             }
 
-            xValues = xValues.filter( onlyUnique );
-            xValues.sort(function(a, b){return a - b});
+            xValues = xValues.filter(onlyUnique);
+            xValues.sort(function(a, b) { return a - b });
 
-            for (var j = 1; j < xValues.length; j++) {
+            for (let j = 1; j < xValues.length; j++) {
                 var distance = Math.abs(xValues[j] - xValues[j - 1]);
                 if (distance < minDistance && isFinite(distance)) {
                     minDistance = distance;
@@ -2502,21 +2499,21 @@ Licensed under the MIT license.
                 }
             }
 
-            return items.sort((a, b) => { 
+            return items.sort((a, b) => {
                 if (b.distance === undefined) {
                     return -1;
                 } else if (a.distance === undefined && b.distance !== undefined) {
                     return 1;
                 }
 
-                return a.distance - b.distance ;
+                return a.distance - b.distance;
             });
         }
 
         function findNearbyItem(mouseX, mouseY, seriesFilter, radius, computeDistance) {
             var items = findNearbyItems(mouseX, mouseY, seriesFilter, radius, computeDistance);
             return items[0] !== undefined ? items[0] : null;
-         }
+        }
 
         // returns the data item the mouse is over/ the cursor is closest to, or null if none is found
         function findItems(mouseX, mouseY, seriesFilter, radius, computeDistance) {
@@ -2550,7 +2547,7 @@ Licensed under the MIT license.
             for (i = 0; i < items.length; i++) {
                 var seriesIndex = items[i].seriesIndex;
                 var dataIndex = items[i].dataIndex;
-                var smallestDistance = items[i].distance;
+                var itemDistance = items[i].distance;
                 var ps = series[seriesIndex].datapoints.pointsize;
 
                 foundItems.push({
@@ -2558,7 +2555,7 @@ Licensed under the MIT license.
                     dataIndex: dataIndex,
                     series: series[seriesIndex],
                     seriesIndex: seriesIndex,
-                    distance: Math.sqrt(smallestDistance)
+                    distance: Math.sqrt(itemDistance)
                 });
             }
 
@@ -2641,17 +2638,19 @@ Licensed under the MIT license.
             var foundIndex = -1;
             for (var j = 0; j < points.length; j += ps) {
                 var x = points[j], y = points[j + 1];
-                if (x == null)
+                if (x == null) {
                     continue;
+                }
 
                 var bottom = ps === 3 ? points[j + 2] : defaultBottom;
                 // for a bar graph, the cursor must be inside the bar
-                if (series.bars.horizontal ?
-                    (mx <= Math.max(bottom, x) && mx >= Math.min(bottom, x) &&
-                        my >= y + barLeft && my <= y + barRight) :
-                    (mx >= x + barLeft && mx <= x + barRight &&
-                        my >= Math.min(bottom, y) && my <= Math.max(bottom, y)))
-                        foundIndex = j / ps;
+                if (series.bars.horizontal
+                    ? (mx <= Math.max(bottom, x) && mx >= Math.min(bottom, x) &&
+                        my >= y + barLeft && my <= y + barRight)
+                    : (mx >= x + barLeft && mx <= x + barRight &&
+                        my >= Math.min(bottom, y) && my <= Math.max(bottom, y))) {
+                    foundIndex = j / ps;
+                }
             }
 
             return foundIndex;

data/vendor/assets/javascripts/flot/jquery.flot.selection.js

@@ -10,6 +10,7 @@ selection: {
     color: color,
     shape: "round" or "miter" or "bevel",
     visualization: "fill" or "focus",
+    displaySelectionDecorations: true or false,
     minSize: number of pixels
 }
 
@@ -26,6 +27,10 @@ option "focus" draws a colored bezel around the selected area while keeping
 the selected area clear. The option "fill" highlights (i.e., fills) the
 selected area with a colored highlight.
 
+There are optional selection decorations (handles) that are rendered with the
+"focus" visualization option. The selection decoration is rendered by default
+but can be turned off by setting displaySelectionDecorations to false.
+
 "minSize" is the minimum size a selection can be in pixels. This value can
 be customized to determine the smallest size a selection can be and still
 have the selection rectangle be displayed. When customizing this value, the
@@ -104,9 +109,7 @@ The plugin allso adds the following methods to the plot object:
         // make this plugin much slimmer.
         var savedhandlers = {};
 
-        var mouseUpHandler = null;
-
-        function onMouseMove(e) {
+        function onDrag(e) {
             if (selection.active) {
                 updateSelection(e);
 
@@ -114,7 +117,7 @@ The plugin allso adds the following methods to the plot object:
             }
         }
 
-        function onMouseDown(e) {
+        function onDragStart(e) {
             var o = plot.getOptions();
             // only accept left-click
             if (e.which !== 1 || o.selection.mode === null) return;
@@ -138,17 +141,9 @@ The plugin allso adds the following methods to the plot object:
             setSelectionPos(selection.first, e);
 
             selection.active = true;
-
-            // this is a bit silly, but we have to use a closure to be
-            // able to whack the same handler again
-            mouseUpHandler = function (e) { onMouseUp(e); };
-
-            $(document).one("mouseup", mouseUpHandler);
         }
 
-        function onMouseUp(e) {
-            mouseUpHandler = null;
-
+        function onDragEnd(e) {
             // revert drag stuff for old-school browsers
             if (document.onselectstart !== undefined) {
                 document.onselectstart = savedhandlers.onselectstart;
@@ -360,8 +355,9 @@ The plugin allso adds the following methods to the plot object:
         plot.hooks.bindEvents.push(function(plot, eventHolder) {
             var o = plot.getOptions();
             if (o.selection.mode != null) {
-                eventHolder.mousemove(onMouseMove);
-                eventHolder.mousedown(onMouseDown);
+                plot.addEventHandler("dragstart", onDragStart, eventHolder, 0);
+                plot.addEventHandler("drag", onDrag, eventHolder, 0);
+                plot.addEventHandler("dragend", onDragEnd, eventHolder, 0);
             }
         });
 
@@ -459,6 +455,7 @@ The plugin allso adds the following methods to the plot object:
 
                 var c = $.color.parse(o.selection.color);
                 var visualization = o.selection.visualization;
+                var displaySelectionDecorations = o.selection.displaySelectionDecorations;
 
                 var scalingFactor = 1;
 
@@ -495,7 +492,10 @@ The plugin allso adds the following methods to the plot object:
                 } else {
                     ctx.fillRect(0, 0, plot.width(), plot.height());
                     ctx.clearRect(x, y, w, h);
-                    drawSelectionDecorations(ctx, x, y, w, h, oX, oY, selectionDirection(plot));
+
+                    if (displaySelectionDecorations) {
+                        drawSelectionDecorations(ctx, x, y, w, h, oX, oY, selectionDirection(plot));
+                    }
                 }
 
                 ctx.restore();
@@ -503,12 +503,9 @@ The plugin allso adds the following methods to the plot object:
         });
 
         plot.hooks.shutdown.push(function (plot, eventHolder) {
-            eventHolder.unbind("mousemove", onMouseMove);
-            eventHolder.unbind("mousedown", onMouseDown);
-
-            if (mouseUpHandler) {
-                $(document).unbind("mouseup", mouseUpHandler);
-            }
+            eventHolder.unbind("dragstart", onDragStart);
+            eventHolder.unbind("drag", onDrag);
+            eventHolder.unbind("dragend", onDragEnd);
         });
     }
 
@@ -518,6 +515,7 @@ The plugin allso adds the following methods to the plot object:
             selection: {
                 mode: null, // one of null, "x", "y" or "xy"
                 visualization: "focus", // "focus" or "fill"
+                displaySelectionDecorations: true, // true or false (currently only relevant for the focus visualization)
                 color: "#888888",
                 shape: "round", // one of "round", "miter", or "bevel"
                 minSize: 5 // minimum number of pixels

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.8.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -222,6 +222,7 @@ files:
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/lib/blacklight_range_limit/segment_calculation_spec.rb
+- spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -255,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin
@@ -266,6 +267,7 @@ test_files:
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/lib/blacklight_range_limit/segment_calculation_spec.rb
+- spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb