blacklight_range_limit 5.0.4 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634026b870d878f4ab9ffc0f8d0f101ff2136317
-  data.tar.gz: 4a89fdf27b5acf0d237fa77848edec77a0d30f8c
+  metadata.gz: b3332162f26f3c37988434d3f9f5cfcf4ad3f8ac
+  data.tar.gz: 1b58632167c84866a291472c294540977417fce6
 SHA512:
-  metadata.gz: ed2522f9cb021084721312501b7b7044c7fa7e8526f90a65f7eded30dad4426fa2c727686aa7a80e102968de5e6239e7286a952470a6c3615da5a091344c7c69
-  data.tar.gz: d23895c6afeb3b24dc22e30f2fa0b69b5a49f9f24e9ef28da418e5b3b1586755bb967c0fe7f92d70825418c0e55db7fe8f40025f08bb29c1c41e485d1bfc5fab
+  metadata.gz: 8cae1eb92de55315ef2318ce89029b2bb70bcb2bcdea411b6adc5a94470fceadd6d3d3be551f0af364710ed01aab5125a7561a4d4a3c49ddabfdf422f8895005
+  data.tar.gz: 7f2356c2213b6c1bf522f9ad7e7c555a497c44a187d50c8e185fc07c0bc6f178d23a8e22521bcbca31e7a2ca033f8843b67fb3e53ed07c7b3a9be4fe4b31b713

data/VERSION

@@ -1 +1 @@
-5.0.4
+5.1.0

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

@@ -155,13 +155,13 @@ Blacklight.onLoad(function() {
         var series_data = new Array();
         var pointer_lookup = new Array();
         var x_ticks = new Array();
-        var min = parseInt($(container).find("ul li:first-child span.from").text());
-        var max = parseInt($(container).find("ul li:last-child span.to").text());
+        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());
 
         $(container).find("ul li").each(function() {
-            var from = parseInt($(this).find("span.from").text());
-            var to = parseInt($(this).find("span.to").text());
-            var count = parseInt($(this).find("span.count").text());
+            var from = BlacklightRangeLimit.parseNum($(this).find("span.from").text());
+            var to = BlacklightRangeLimit.parseNum($(this).find("span.to").text());
+            var count = BlacklightRangeLimit.parseNum($(this).find("span.count").text());
             var avg = (count / (to - from + 1));
 
 
@@ -174,7 +174,7 @@ Blacklight.onLoad(function() {
 
             pointer_lookup.push({'from': from, 'to': to, 'count': count, 'label': $(this).find(".facet_select").text() });
         });
-        var max_plus_one = parseInt($(container).find("ul li:last-child span.to").text())+1;
+        var max_plus_one = BlacklightRangeLimit.parseNum($(container).find("ul li:last-child span.to").text())+1;
         x_ticks.push( max_plus_one );
 
 
@@ -205,7 +205,7 @@ Blacklight.onLoad(function() {
 
           if(segment != last_segment) {
             $('.distribution').tooltip('destroy');
-            $('.distribution').tooltip({'title': function() { return find_segment_for(pos.x).label  + ' (' + segment.count + ')' }, 'placement': 'bottom', 'trigger': 'manual', 'delay': { show: 0, hide: 100}});
+            $('.distribution').tooltip({'title': function() { return find_segment_for(pos.x).label  + ' (' + BlacklightRangeLimit.parseNum(segment.count) + ')' }, 'placement': 'bottom', 'trigger': 'manual', 'delay': { show: 0, hide: 100}});
             $('.distribution').tooltip('show');
 
             last_segment  = segment;
@@ -266,11 +266,11 @@ Blacklight.onLoad(function() {
     }
 
     function form_selection(form, min, max) {
-      var begin_val = parseInt($(form).find("input.range_begin").val());
+      var begin_val = BlacklightRangeLimit.parseNum($(form).find("input.range_begin").val());
       if (isNaN(begin_val) || begin_val < min) {
         begin_val = min;
       }
-      var end_val = parseInt($(form).find("input.range_end").val());
+      var end_val = BlacklightRangeLimit.parseNum($(form).find("input.range_end").val());
       if (isNaN(end_val) || end_val > max) {
         end_val = max;
       }
@@ -297,4 +297,4 @@ Blacklight.onLoad(function() {
 
       return (flotLoaded && canvasAvailable);
     }
-});
+});

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

@@ -0,0 +1,24 @@
+
+// takes a string and parses into an integer, but throws away commas first, to avoid truncation when there is a comma
+// use in place of javascript's native parseInt
+!function(global) {
+  'use strict';
+
+  var previousBlacklightRangeLimit = global.BlacklightRangeLimit;
+
+  function BlacklightRangeLimit(options) {
+    this.options = options || {};
+  }
+
+  BlacklightRangeLimit.noConflict = function noConflict() {
+    global.BlacklightRangeLimit = previousBlacklightRangeLimit;
+    return BlacklightRangeLimit;
+  };
+
+  BlacklightRangeLimit.parseNum = function parseNum(str) {
+    str = String(str).replace(/[^0-9]/g, '');
+    return parseInt(str, 10);
+  };
+
+  global.BlacklightRangeLimit = BlacklightRangeLimit;
+}(this);

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

@@ -50,7 +50,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
   end_el.val(max);
         
   begin_el.change( function() {
-    var val = parseInt($(this).val());
+    var val = BlacklightRangeLimit.parseNum($(this).val());
     if ( isNaN(val)  || val < min) {
       //for weird data, set slider at min           
       val = min;
@@ -61,7 +61,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
   });
         
   end_el.change( function() {
-     var val = parseInt($(this).val());
+     var val = BlacklightRangeLimit.parseNum($(this).val());
      if ( isNaN(val) || val > max ) {
        //weird entry, set slider to max
        val = max;
@@ -96,16 +96,16 @@ function min_max(range_element) {
    
    
    
-   var min = max = parseInt(current_limit.find(".single").text())
+   var min = max = BlacklightRangeLimit.parseNum(current_limit.find(".single").text())
    if ( isNaN(min)) {
-     min = parseInt(current_limit.find(".from").first().text());
-     max = parseInt(current_limit.find(".to").first().text());
+     min = BlacklightRangeLimit.parseNum(current_limit.find(".from").first().text());
+     max = BlacklightRangeLimit.parseNum(current_limit.find(".to").first().text());
    }
   
    if (isNaN(min) || isNaN(max)) {
       //no current limit, take from results min max included in spans
-      min = parseInt($(range_element).find(".min").first().text());
-      max = parseInt($(range_element).find(".max").first().text());
+      min = BlacklightRangeLimit.parseNum($(range_element).find(".min").first().text());
+      max = BlacklightRangeLimit.parseNum($(range_element).find(".max").first().text());
    }
    
    return [min, max]

data/lib/blacklight_range_limit/controller_override.rb

@@ -43,7 +43,7 @@ module BlacklightRangeLimit
       # Not really any good way to turn off facet.field's from the solr default,
       # no big deal it should be well-cached at this point.
 
-      @response = Blacklight.solr.get( blacklight_config.solr_path, :params => solr_params )
+      @response = Blacklight.default_index.connection.get( blacklight_config.solr_path, :params => solr_params )
 
       render('blacklight_range_limit/range_segments', :locals => {:solr_field => solr_field}, :layout => !request.xhr?)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -185,6 +185,7 @@ files:
 - VERSION
 - app/assets/javascripts/blacklight_range_limit.js
 - app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
+- app/assets/javascripts/blacklight_range_limit/range_limit_shared.js
 - app/assets/javascripts/blacklight_range_limit/range_limit_slider.js
 - app/assets/stylesheets/blacklight_range_limit.css.scss
 - app/assets/stylesheets/blacklight_range_limit/blacklight_range_limit.css