Changeset 31740

Timestamp:

2017-06-15T13:59:32+12:00 (6 years ago)

Author:

kjdon

Message:

need to make firstNumber and secondNumber actual number variables, not string variables. otherwise eg 2 is not less than 10

File:

• main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js (modified) (4 diffs)

main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

@@ -811 +811 @@
       var currentValue = values[l].replace(/^ +/g, "").replace(/ +$/g, "");
       if (numeric_match) {
-    var isRange = (currentValue.search(/\d+-\d+/) != -1);
+    var isRange = (currentValue.search(/^\d+-\d+$/) != -1);
     if (isRange) {
-      var firstNumber = currentValue.replace(/(\d+)-\d+/, "$1");
-      var secondNumber = currentValue.replace(/\d+-(\d+)/, "$1");
-      
+        var firstNumber = Number(currentValue.replace(/(\d+)-\d+/, "$1"));
+        var secondNumber = Number(currentValue.replace(/\d+-(\d+)/, "$1"));
       if(firstNumber <= secondNumber)
         {
@@ -822 +821 @@
           var numString = i + "";
           for(var j = 0; j < _titles.length; j++) {
-            
             var currentTitle = _titles[j];
             if(currentTitle[index] == numString) {
-              matchingTitles.push(currentTitle);
+            matchingTitles.push(currentTitle);
+            break; // assume no titles are the same
             }
           }
@@ -835 +834 @@
         if (_titles[j][index]==currentValue) {
           matchingTitles.push(_titles[j]);
+        break; // assume no titles are the same
         }
       }
@@ -864 +864 @@
       $(matchingTitles[i][1].cell).css("display", "table-cell");
     }
-    }
+    } // end doFiltering() function
 
     var setUpFilterBox = function()