blacklight_range_limit 6.3.1 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1d33929c3b467aabfd05e1c4660ee0dbb35fabe
-  data.tar.gz: 4a719dc548eeb70113bda1eb649beb66297c1255
+  metadata.gz: 74c3ef45b20cef3fca718c010b4b015ba4973889
+  data.tar.gz: 8827ea0b53689f8a2bea2eece4ecc8a4bcd769d5
 SHA512:
-  metadata.gz: 05fe6917efeddcdb3ba73f8e6573c93e9deaf3afa6e97cc5501fdc9c43152904c90c9cc8268fcfbfdc9847ac86ee1433b976eaa2d4828aa458a0bca78fc53a5e
-  data.tar.gz: 396513669cc7fd2d57c1d4cd51a660e640084cc5959f3954ec7b0765c0faa7d3eb3528b167aa3aa110dd9b71aa2c16032805655d3e6c899e2dc1d61ee393ba6f
+  metadata.gz: 4f3336c92e6b2c28745dc80513806608238ab481ae4505882e24f62496062837ce2a6abec8f83a8fc6ec3e0fe751b31abf4776c81141ef82e31ffd4c6032cd02
+  data.tar.gz: bf309b780be21450e436813ca200cea230a02a56c98b91c94a25b4a92a8b620f4343a97842b0772a6147cd1c0bb30df224fa3170dcbc080087d155099cec3311

data/VERSION

@@ -1 +1 @@
-6.3.1
+6.3.2

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

@@ -44,6 +44,15 @@ $(".range_limit .profile .range.slider_js").each(function() {
         slider_el.css("width", "100%");
       }
      }
+    
+     // Slider change should update text input values.
+     var parent = $(this).parent();
+     var form = $(parent).closest(".limit_content").find("form.range_limit");
+     $(parent).closest(".limit_content").find(".profile .range").on("slide", function(event, ui) {
+      var values = $(event.target).data("slider").getValue();
+      form.find("input.range_begin").val(values[0]);
+      form.find("input.range_end").val(values[1]);
+     });
    }
 
   begin_el.val(min);

data/app/helpers/range_limit_helper.rb

@@ -63,7 +63,7 @@ module RangeLimitHelper
   end
 
   def add_range_missing(solr_field, my_params = params)
-    my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
+    my_params = Blacklight::SearchState.new(my_params.except(:page), blacklight_config).to_h
     my_params["range"] ||= {}
     my_params["range"][solr_field] ||= {}
     my_params["range"][solr_field]["missing"] = "true"
@@ -77,7 +77,7 @@ module RangeLimitHelper
   end
 
   def add_range(solr_field, from, to, my_params = params)
-    my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
+    my_params = Blacklight::SearchState.new(my_params.except(:page), blacklight_config).to_h
     my_params["range"] ||= {}
     my_params["range"][solr_field] ||= {}
 

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

@@ -30,7 +30,7 @@
 
   <% unless params["range"] && params["range"][solr_field] && params["range"][solr_field]["missing"] %>  
     <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{solr_field}"].join(' ') do %>
-      <%= render_hash_as_hidden_fields(search_state.params_for_search) %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:page)) %>
       
       <!-- we need to include a dummy search_field parameter if none exists,
            to trick blacklight into displaying actual search results instead

data/spec/features/blacklight_range_limit_spec.rb

@@ -27,6 +27,14 @@ describe "Blacklight Range Limit" do
     expect(page).to have_content "2000 to 2008 [remove] 12"
   end
 
+  it "should not include page parameter" do
+    visit search_catalog_path(page: 2)
+    click_link 'View distribution'
+    click_link '2000 to 2008'
+    click_button 'Limit'
+    expect(page.current_url).not_to include('page')
+  end
+
   context 'when I18n translation is available' do
     before do
       I18n.backend.store_translations(:en, blacklight: {search: {fields: {facet: {pub_date_sort: 'Publication Date I18n'}}}})

data/spec/helpers/blacklight_range_limit_helper_spec.rb

@@ -16,4 +16,22 @@ describe "Blacklight Range Limit Helper" do
     expect(html_maxlength_6).to have_css 'input.form-control.range_begin#range_pub_date_begin[maxlength="6"]'
   end
 
+  context "when building requests" do
+    let(:config) { Blacklight::Configuration.new }
+    before do
+      allow(helper).to receive(:blacklight_config).and_return(config)
+    end
+
+    it "should exclude page when adding a range" do
+      params = { q: '', page: '2' }
+      updated_params = helper.add_range('test', '1900', '1995', params)
+      expect(updated_params).not_to include(:page)
+    end
+
+    it "should exclude page when adding a missing range" do
+      params = { q: '', page: '2' }
+      updated_params = helper.add_range_missing('test', params)
+      expect(updated_params).not_to include(:page)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.3.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin