blacklight_range_limit 7.2.0 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb716f6bce403a2d7f369337d8f4a8da47dc279895c8c5bb3996a9ac2edcdae
-  data.tar.gz: f758c04d42477a7650b4f164c5ee4889a4edc903d22ddff3639c71ed216c3d70
+  metadata.gz: 2734b8690264ccc35bd5b2e2f494fb108027154597e2e03789c7b969e86342f2
+  data.tar.gz: 4dc2cb49b054401e6696fdd7a2f118edf1d686004a1a2f97ae294a4bc0cc19d2
 SHA512:
-  metadata.gz: 1cb56737784cf18e63e857494d5f7b41216a4238ae7b02f2080f82146403e7e523d43beb1ad0e353d942df03fe4b5292a92d02fcfee53ab19c755c0da2e5e5e1
-  data.tar.gz: 6bb5e1f046e4db352ca9d9f0fcfe809af4d61bc75b75be55318bc40463f14be4421839669c60e7e9442cd8c51585ac76ee164c81eaa5b2af4c9b1f2bc16b75c6
+  metadata.gz: 5e533e776139bf3a7d18d2387c0d56a50b199a7b3879cfb6c1e56056ea138f514d4d1d17c9aa491b8f10c8c6b0b9d9ae4e5f89c1487567af88aad36eceddf589
+  data.tar.gz: 55e9cf4e8f6a34ae8d2f35be0ba4df53cfd996c9e2cc1b532796c337b956e28fa6c2ca6780eae75338c2e1ad2a15afe33183ec860a6c96d009d4f3b610908e9b

data/VERSION

@@ -1 +1 @@
-7.2.0
+7.3.0

data/app/assets/javascripts/blacklight_range_limit.js

@@ -6,7 +6,14 @@
 // JS to work, expect host app to load it.
 
 
+//= require 'flot/jquery.canvaswrapper.js'
+//= require 'flot/jquery.colorhelpers.js'
 //= require 'flot/jquery.flot.js'
+//= require 'flot/jquery.flot.browser.js'
+//= require 'flot/jquery.flot.saturated.js'
+//= require 'flot/jquery.flot.drawSeries.js'
+//= require 'flot/jquery.flot.hover.js'
+//= require 'flot/jquery.flot.uiConstants.js'
 //= require 'flot/jquery.flot.selection.js'
 //= require 'bootstrap-slider'
 

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

@@ -17,17 +17,7 @@ Blacklight.onLoad(function() {
       turnIntoPlot($(this).parent());
   });
 
-
-  // Add AJAX fetched range facets if needed, and add a chart to em
-  $(".range_limit .profile .distribution a.load_distribution").each(function() {
-      var container = $(this).parent('div.distribution');
-
-      $(container).load($(this).attr('href'), function(response, status) {
-          if ($(container).hasClass("chart_js") && status == "success" ) {
-            turnIntoPlot(container);
-          }
-      });
-  });
+  checkForNeededFacetsToFetch();
 
   // Listen for twitter bootstrap collapsible open events, to render flot
   // in previously hidden divs on open, if needed.
@@ -45,6 +35,28 @@ Blacklight.onLoad(function() {
     }
   });
 
+  // When loaded in a modal
+  $(Blacklight.modal.modalSelector).on('shown.bs.modal', function() {
+    $(this).find(".range_limit .profile .distribution.chart_js ul").each(function() {
+      turnIntoPlot($(this).parent());
+    });
+
+    // Case when there is no currently selected range
+    checkForNeededFacetsToFetch();
+  });
+
+  // Add AJAX fetched range facets if needed, and add a chart to em
+  function checkForNeededFacetsToFetch() {
+    $(".range_limit .profile .distribution a.load_distribution").each(function() {
+      var container = $(this).parent('div.distribution');
+
+      $(container).load($(this).attr('href'), function(response, status) {
+        if ($(container).hasClass("chart_js") && status == "success" ) {
+          turnIntoPlot(container);
+          }
+      });
+    });
+  }
 
 
   // after a collapsible facet contents is fully shown,

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

@@ -1,85 +1,16 @@
 // for Blacklight.onLoad:
 
 Blacklight.onLoad(function() {
-        
-$(".range_limit .profile .range.slider_js").each(function() {
-   var range_element = $(this);
-    
-   var boundaries = min_max(this);
-   var min = boundaries[0];
-   var max = boundaries[1];
-
-   if (isInt(min) && isInt(max)) {
-     $(this).contents().wrapAll('<div style="display:none" />');
-     
-     var range_element = $(this);
-     var form = $(range_element).closest(".range_limit").find("form.range_limit");
-     var begin_el = form.find("input.range_begin");
-     var end_el = form.find("input.range_end");
-
-     var placeholder_input = $('<input type="text" data-slider-placeholder="true" style="width:100%;">').appendTo(range_element);
-     
-     // make sure slider is loaded
-     if (placeholder_input.slider !== undefined) {
-      placeholder_input.slider({
-        min: min,
-        max: max+1,
-        value: [min, max+1],
-        tooltip: "hide"
-      });
 
-      // try to make slider width/orientation match chart's
-      var container      = range_element.closest(".range_limit");
-      var plot           = container.find(".chart_js").data("plot");
-      var slider_el      = container.find(".slider");
-       
-      if (plot && slider_el) { 
-        slider_el.width(plot.width());
-        slider_el.css("display", "block")
-        slider_el.css('margin-right', 'auto');
-        slider_el.css('margin-left', 'auto'); 
-      }
-      else if (slider_el) {
-        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]);
-     });
-   }
+  $(".range_limit .profile .range.slider_js").each(function() {
+    buildSlider(this);
+  });
 
-  begin_el.val(min);
-  end_el.val(max);
-        
-  begin_el.change( function() {
-    var val = BlacklightRangeLimit.parseNum($(this).val());
-    if ( isNaN(val)  || val < min) {
-      //for weird data, set slider at min           
-      val = min;
-    }
-    var values = placeholder_input.data("slider").getValue();
-    values[0] = val;
-    placeholder_input.slider("setValue", values);
+  $(Blacklight.modal.modalSelector).on('shown.bs.modal', function() {
+    $(this).find(".range_limit .profile .range.slider_js").each(function() {
+      buildSlider(this);
+    });
   });
-        
-  end_el.change( function() {
-     var val = BlacklightRangeLimit.parseNum($(this).val());
-     if ( isNaN(val) || val > max ) {
-       //weird entry, set slider to max
-       val = max;
-     }
-    var values = placeholder_input.data("slider").getValue();
-    values[1] = val;
-    placeholder_input.slider("setValue", values);
-  });    
-   
-});
 
 // catch event for redrawing chart, to redraw slider to match width
 $("body").on("plotDrawn.blacklight.rangeLimit", function(event) {
@@ -126,4 +57,80 @@ function isInt(n) {
   return n % 1 === 0;
 }
 
+  function buildSlider(thisContext) {
+    var range_element = $(thisContext);
+
+    var boundaries = min_max(thisContext);
+    var min = boundaries[0];
+    var max = boundaries[1];
+
+    if (isInt(min) && isInt(max)) {
+      $(thisContext).contents().wrapAll('<div style="display:none" />');
+
+      var range_element = $(thisContext);
+      var form = $(range_element).closest(".range_limit").find("form.range_limit");
+      var begin_el = form.find("input.range_begin");
+      var end_el = form.find("input.range_end");
+
+      var placeholder_input = $('<input type="text" data-slider-placeholder="true" style="width:100%;">').appendTo(range_element);
+
+      // make sure slider is loaded
+      if (placeholder_input.slider !== undefined) {
+        placeholder_input.slider({
+          min: min,
+          max: max + 1,
+          value: [min, max + 1],
+          tooltip: "hide"
+        });
+
+        // try to make slider width/orientation match chart's
+        var container = range_element.closest(".range_limit");
+        var plot = container.find(".chart_js").data("plot");
+        var slider_el = container.find(".slider");
+
+        if (plot && slider_el) {
+          slider_el.width(plot.width());
+          slider_el.css("display", "block")
+          slider_el.css('margin-right', 'auto');
+          slider_el.css('margin-left', 'auto');
+        } else if (slider_el) {
+          slider_el.css("width", "100%");
+        }
+      }
+
+      // Slider change should update text input values.
+      var parent = $(thisContext).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);
+    end_el.val(max);
+
+    begin_el.change(function() {
+      var val = BlacklightRangeLimit.parseNum($(thisContext).val());
+      if (isNaN(val) || val < min) {
+        //for weird data, set slider at min           
+        val = min;
+      }
+      var values = placeholder_input.data("slider").getValue();
+      values[0] = val;
+      placeholder_input.slider("setValue", values);
+    });
+
+    end_el.change(function() {
+      var val = BlacklightRangeLimit.parseNum($(thisContext).val());
+      if (isNaN(val) || val > max) {
+        //weird entry, set slider to max
+        val = max;
+      }
+      var values = placeholder_input.data("slider").getValue();
+      values[1] = val;
+      placeholder_input.slider("setValue", values);
+    });
+  }
 });

data/app/assets/stylesheets/blacklight_range_limit/blacklight_range_limit.css

@@ -19,4 +19,29 @@ form.range_limit {
 .slider_js .slider-selection {
   /* color from flot selection */
   background: #e8cfac;
-}
+}
+
+.modal-body .view_larger, .facet-values {
+  display: none;
+}
+
+form .range_limit_label {
+  display: none;
+}
+
+.modal-body .range_limit_label {
+  display: flex;
+}
+
+.modal-body .range_limit {
+  justify-content: center;
+}
+
+.view_larger {
+  display: block;
+  text-align: center;
+}
+
+.range_limit .chart_js {
+  min-height: 80px;
+}

data/app/helpers/range_limit_helper.rb

@@ -32,12 +32,12 @@ module RangeLimitHelper
     hash = my_params[:range][solr_field]
     
     if hash["missing"]
-      return BlacklightRangeLimit.labels[:missing]
+      return t('blacklight.range_limit.missing')
     elsif hash["begin"] || hash["end"]
       if hash["begin"] == hash["end"]
-        return "<span class='single'>#{h(hash["begin"])}</span>".html_safe
+        return t('blacklight.range_limit.single_html', begin: h(hash['begin']))
       else
-        return "<span class='from'>#{h(hash['begin'])}</span> to <span class='to'>#{h(hash['end'])}</span>".html_safe
+        return t('blacklight.range_limit.range_html', begin: h(hash['begin']), end: h(hash['end']))
       end
     end
 

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

@@ -13,7 +13,7 @@
       <li class="selected">
         <span class="facet-label">
           <span class="selected"><%= range_display(field_name) %></span>
-          <%= link_to remove_range_param(field_name), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
+          <%= link_to search_action_url(remove_range_param(field_name).except(:controller, :action)), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
             <span class="remove-icon">✖</span>
             <span class="sr-only">[<%= t('blacklight.range_limit.remove_limit') %>]</span>
           <% end %>
@@ -24,15 +24,6 @@
 
   <% end %>
 
-  <% unless selected_missing_for_range_limit?(field_name) %>
-    <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{field_name}"].join(' ') do %>
-      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:page)) %>
-
-      <%= render_range_input(field_name, :begin, input_label_range_begin, maxlength) %> – <%= render_range_input(field_name, :end, input_label_range_end, maxlength) %>
-      <%= submit_tag t('blacklight.range_limit.submit_limit'), class: BlacklightRangeLimit.classes[:submit] %>
-    <% end %>
-  <% end %>
-
   <!-- no results profile if missing is selected -->
   <% unless selected_missing_for_range_limit?(field_name) %>
     <!-- you can hide this if you want, but it has to be on page if you want
@@ -44,9 +35,6 @@
 
         <% if (min = range_results_endpoint(field_name, :min)) &&
               (max = range_results_endpoint(field_name, :max)) %>
-          <p class="range subsection <%= "slider_js" unless field_config[:slider_js] == false %>">
-            Current results range from <span class="min"><%= range_results_endpoint(field_name, :min) %></span> to <span class="max"><%= range_results_endpoint(field_name, :max) %></span>
-          </p>
 
           <% if field_config[:segments] != false %>
             <div class="distribution subsection <%= 'chart_js' unless field_config[:chart_js] == false %>">
@@ -58,24 +46,39 @@
                  <%= render(:partial => "blacklight_range_limit/range_segments", :locals => {:solr_field => field_name}) %>
 
               <% else %>
-                <%= link_to('View distribution', main_app.url_for(search_state.to_h.merge(action: 'range_limit', range_field: field_name, range_start: min, range_end: max)), :class => "load_distribution") %>
+                <%= link_to(t('blacklight.range_limit.view_distribution'), search_action_url(search_state.to_h.merge(action: 'range_limit', range_field: field_name, range_start: min, range_end: max)), :class => "load_distribution") %>
               <% end %>
             </div>
           <% end %>
-        <% end %>
-
-        <% if (stats = stats_for_field(field_name)) && stats["missing"] > 0 %>
-          <ul class="missing list-unstyled facet-values subsection">
-            <li>
-              <span class="facet-label">
-                <%= link_to BlacklightRangeLimit.labels[:missing], add_range_missing(field_name) %>
-              </span>
-              <%# note important there be no whitespace inside facet-count to avoid
-                  bug in some versions of Blacklight (including 7.1.0.alpha) %>
-              <span class="facet-count"><%= number_with_delimiter(stats["missing"]) %></span>
-            </li>
-          </ul>
+          <p class="range subsection <%= "slider_js" unless field_config[:slider_js] == false %>">
+            <%= t('blacklight.range_limit.results_range_html', min: range_results_endpoint(field_name, :min), max: range_results_endpoint(field_name, :max)) %>
+          </p>
         <% end %>
     </div>
+
+    <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{field_name}"].join(' ') do %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:page)) %>
+      <%= content_tag :label, t('blacklight.range_limit.date_range_label'), class: 'range_limit_label' %>
+      <%= render_range_input(field_name, :begin, input_label_range_begin, maxlength) %> – <%= render_range_input(field_name, :end, input_label_range_end, maxlength) %>
+      <%= submit_tag t('blacklight.range_limit.submit_limit'), class: BlacklightRangeLimit.classes[:submit] %>
+    <% end %>
+
+    <%= link_to t('blacklight.range_limit.view_larger', field_name: label),
+        search_action_url(search_state.to_h.merge(action: 'range_limit_panel', id: field_name, range_start: 0, range_end: 2019)),
+        class: 'view_larger mt-1',
+        data: { blacklight_modal: 'trigger' } %>
+
+    <% if (stats = stats_for_field(field_name)) && stats["missing"] > 0 %>
+      <ul class="missing list-unstyled facet-values subsection">
+        <li>
+          <span class="facet-label">
+            <%= link_to t('blacklight.range_limit.missing'), search_action_url(add_range_missing(field_name).except(:controller, :action)) %>
+          </span>
+          <%# note important there be no whitespace inside facet-count to avoid
+              bug in some versions of Blacklight (including 7.1.0.alpha) %>
+          <span class="facet-count"><%= number_with_delimiter(stats["missing"]) %></span>
+        </li>
+      </ul>
+    <% end %>
   <% end %>
 </div>

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

@@ -6,12 +6,12 @@
     <li>
         <span class="facet-label">
             <%= link_to(
-              content_tag("span", facet_display_value(solr_field, hash[:from]), :class => "from") + 
-                " to " + 
-                content_tag("span", facet_display_value(solr_field, hash[:to]), :class => "to"), 
-                add_range(solr_field, hash[:from], hash[:to]).merge(:action => "index"),
-                :class => "facet_select"
-              ) %> 
+                  t('blacklight.range_limit.range_html',
+                  begin: facet_display_value(solr_field, hash[:from]),
+                  end: facet_display_value(solr_field, hash[:to])),
+                  search_action_url(add_range(solr_field, hash[:from], hash[:to]).except(:controller, :action)),
+                  class: 'facet_select'
+              ) %>
         </span>
         <%= render_facet_count hash[:count], classes: ['count'] %>
     </li>

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

@@ -0,0 +1,10 @@
+<div class="modal-header">
+  <h1 class="modal-title"><%= facet_field_label(@facet.key) %></h1>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+
+<div class="modal-body">
+  <%= render :partial => "blacklight_range_limit/range_limit_panel", :locals => {field_name: @facet.key} %>
+</div>

data/config/locales/blacklight_range_limit.en.yml

@@ -5,3 +5,10 @@ en:
       range_end: "%{field_label} range end"
       submit_limit: 'Limit'
       remove_limit: 'remove'
+      missing: 'Unknown'
+      view_distribution: 'View distribution'
+      view_larger: 'View larger »'
+      date_range_label: 'Date range:'
+      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>'

data/lib/blacklight_range_limit.rb

@@ -13,10 +13,8 @@ module BlacklightRangeLimit
   # Raised when an invalid range is encountered
   class InvalidRange < TypeError; end
 
-  mattr_accessor :labels, :classes
-  self.labels = {
-    :missing => "Unknown"
-  }
+  mattr_accessor :classes
+
   self.classes = {
     form: 'range_limit subsection form-inline',
     submit: 'submit btn btn-secondary'