Merge pull request vitmalina#1106 from ceedriic/searchData

w2grid.js: protect against null pointer
jhwinters · Nov 16, 2015 · fa61b7e · fa61b7e
2 parents ebb42c8 + 1c8fe96
commit fa61b7e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/w2grid.js b/src/w2grid.js
@@ -4033,7 +4033,7 @@
                     for (var s = 0; s < obj.searchData.length; s++) {
                         var sdata = obj.searchData[s];
                         var fld = obj.getSearch(sdata.field);
-                        if (fld.hidden) continue;
+                        if (!fld || fld.hidden) continue;
                         if (str.indexOf(sdata.value) == -1) str.push(sdata.value);
                     }
                     if (str.length > 0) $(obj.box).find('.w2ui-grid-data > div').w2marker(str);
@@ -6240,7 +6240,7 @@
                     for (var s = 0; s < obj.searchData.length; s++) {
                         var sdata = obj.searchData[s];
                         var fld = obj.getSearch(sdata.field);
-                        if (fld.hidden) continue;
+                        if (!fld || fld.hidden) continue;
                         if (str.indexOf(sdata.value) == -1) str.push(sdata.value);
                     }
                     if (str.length > 0) $(obj.box).find('.w2ui-grid-data > div').w2marker(str);