Changeset 982

Timestamp:

21/04/17 20:15:42 (4 years ago)

Author:

mjuckes

Message:

javascript filter bug fixes

File:

• CMIP6dreqbuild/trunk/src/framework/websiteExtras/mipVars.html (modified) (4 diffs)

CMIP6dreqbuild/trunk/src/framework/websiteExtras/mipVars.html

@@ -105 +105 @@
           return false;
       }
+
   function colAndFilter( t, s ) {
           var res = t.split(" ");
           for (i = 0; i < res.length; i++) {
-            if (s.indexOf(res[i]) === -1 ) {
+            if (s.indexOf(res[i]) == -1 ) {
                return false;
              }
@@ -114 +115 @@
           return true;
       }
+
   function filter(item) {
     for (var columnId in columnFilters) {
@@ -120 +122 @@
         var t = columnFilters[columnId].toLowerCase()
         var s = item[c.field].toLowerCase()
+        if ( columnId == 0 ) {
+          var s = s.split(" ")[0]
+        }
         if (t.substr(0,1) == '$') {
           if ( s.substr(0,t.length-1) != t.substr(1,t.length) ) {
@@ -125 +130 @@
           }
         } else if (t.substr(0,1) == '&') {
-            if (!colAndFilter(t.substr(1,t.length),s) ) {
+            if (!colAndFilter(t.substr(1,t.length-1),s) ) {
                return false;
             }