blacklight_range_limit 7.7.0 → 7.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2167f6be6b6b4e9b67276d274aed5d5a3422779297c7630509bc9d562d355a76
-  data.tar.gz: 290370f3bfc33223c8a8ead2547241f6d5af25647acd6fce5f37bfefbcf3bbdc
+  metadata.gz: 6c31bc65d3f409a118dffda97b7b744f1d846151e57e7c64b3757660fb2af23c
+  data.tar.gz: baf34fb3d88a9f0d438b3689dfd51aa1ec3dfc4e5636ef654bc414a46ff17646
 SHA512:
-  metadata.gz: 52823d196806781d9c00ffe501f9b96c1d6c0808fdb6cd0aa14484873624ab744079d0751a8c9a9f9de5082b28cf1226214bcd517cbc2eae04d7125dff3d0a6d
-  data.tar.gz: '04678a126c9947e4d6dcd9f56a9ffb71b61072e9d0f3f5f907ca6e98c1b0958bf8e2fd89d7057c5114ad08af444301f3d19a9b65dd1c2c1e093eef0a8eb897e8'
+  metadata.gz: 3c4dd6d2ce9248b5587687d3b2f56db705ebb2915e1e6772e799493bad5c1bb4d47a822eeb5319c3daba2f88d7f60b62188f9856cb0dbbd16feb2c9e4f78294d
+  data.tar.gz: b08cc82a380cedb3ed79122c5dd92a21e0232c6e6fa5644b66cb82e67787e71126c382be80bab556786fb852e40c4557cb2524242af58877048fe89f7a134f03

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.7.0
+7.8.0

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,7 @@ function min_max(range_element) {
       min = BlacklightRangeLimit.parseNum($(range_element).find(".min").first().text());
       max = BlacklightRangeLimit.parseNum($(range_element).find(".max").first().text());
    }
-   
+   console.log(min, max)
    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/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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 7.7.0
+  version: 7.8.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight