Changeset 28247 for main/trunk/greenstone3/web/interfaces/default/js

Timestamp:

2013-09-10T12:55:00+12:00 (11 years ago)

Author:

sjm84

Message:

Added comma support to the paged-image filter

File:

• main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js (modified) (1 diff)

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

@@ -640 +640 @@
         filter.keyup(function()
         {
-            var currentValue = filter.val();
-            var isRange = (currentValue.search(/\d+-\d+/) != -1)
+            var fullValue = filter.val().replace(/ /g, "");
+            var values = fullValue.split(",");
             
-            var found = false;
-            for(var i = 0; i < _titles.length; i++)
-            {
-                if(_titles[i][0] == currentValue)
-                {
-                    found = true;
+            var matchingTitles = new Array();
+            
+            for (var l = 0; l < values.length; l++)
+            {
+                var currentValue = values[l];
+                var isRange = (currentValue.search(/\d+-\d+/) != -1)
+                
+                var found = false;
+                for(var i = 0; i < _titles.length; i++)
+                {
+                    if(_titles[i][0] == currentValue)
+                    {
+                        found = true;
+                    }
                 }
-            }
-            
-            if(!found && isRange)
-            {
-                var firstNumber = currentValue.replace(/^(\d+)-\d+$/, "$1");
-                var secondNumber = currentValue.replace(/^\d+-(\d+)$/, "$1");
                 
-                if(firstNumber <= secondNumber)
-                {
-                    var matchingTitles = new Array();
-                    for(var i = firstNumber; i <= secondNumber; i++)
+                if(!found && isRange)
+                {
+                    var firstNumber = currentValue.replace(/(\d+)-\d+/, "$1");
+                    var secondNumber = currentValue.replace(/\d+-(\d+)/, "$1");
+                    
+                    if(firstNumber <= secondNumber)
                     {
-                        var numString = i + "";
-                        for(var j = 0; j < _titles.length; j++)
+                        for(var i = firstNumber; i <= secondNumber; i++)
                         {
-                            var currentTitle = _titles[j];
-                            if(currentTitle[0].search(numString) != -1)
+                            var numString = i + "";
+                            for(var j = 0; j < _titles.length; j++)
                             {
-                                matchingTitles.push(currentTitle);
+                                var currentTitle = _titles[j];
+                                if(currentTitle[0].search(numString) != -1)
+                                {
+                                    matchingTitles.push(currentTitle);
+                                }
                             }
                         }
                     }
-                    
+                }
+                else
+                {
                     for(var i = 0; i < _titles.length; i++)
                     {
-                        $(_titles[i][1].cell).css("display", "none");
-                    }
-                    
-                    for(var i = 0; i < matchingTitles.length; i++)
-                    {
-                        $(matchingTitles[i][1].cell).css("display", "table-cell");
+                        var currentTitle = _titles[i];
+                        if(currentTitle[0].search(currentValue.replace(/\./g, "\\.")) != -1)
+                        {
+                            matchingTitles.push(currentTitle);
+                        }
                     }
                 }
             }
-            else
-            {
-                for(var i = 0; i < _titles.length; i++)
-                {
-                    var currentTitle = _titles[i];
-                    if(currentTitle[0].search(currentValue.replace(/\./g, "\\.")) != -1)
-                    {
-                        $(currentTitle[1].cell).css("display", "table-cell");
-                    }
-                    else
-                    {
-                        $(currentTitle[1].cell).css("display", "none");
-                    }
-                }
+            
+            for(var i = 0; i < _titles.length; i++)
+            {
+                $(_titles[i][1].cell).css("display", "none");
+            }
+            
+            for(var i = 0; i < matchingTitles.length; i++)
+            {
+                $(matchingTitles[i][1].cell).css("display", "table-cell");
             }
         });