Merge pull request #2 from PhilipRieck/nullfix

Allow filtering of data when some keyed columns contain null
tochoromero · Aug 19, 2016 · 18a73c6 · 18a73c6
2 parents 77cf1ab + 4f9e242
commit 18a73c6
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 21 deletions.
diff --git a/dist/amd/au-table.js b/dist/amd/au-table.js
@@ -183,11 +183,14 @@ define(["exports", "aurelia-framework"], function (exports, _aureliaFramework) {
 
                     var key = _ref2;
 
-                    var value = next[key].toString();
 
-                    if (value.toLowerCase().indexOf(this.filterText.toLowerCase()) > -1) {
-                        filteredData.push(next);
-                        break;
+                    if (next[key] != null) {
+                        var value = next[key].toString().toLowerCase();
+
+                        if (value.indexOf(this.filterText.toLowerCase()) > -1) {
+                            filteredData.push(next);
+                            break;
+                        }
                     }
                 }
             }

diff --git a/dist/commonjs/au-table.js b/dist/commonjs/au-table.js
@@ -180,11 +180,14 @@ var AureliaTableCustomAttribute = exports.AureliaTableCustomAttribute = (_dec =
 
                 var key = _ref2;
 
-                var value = next[key].toString();
 
-                if (value.toLowerCase().indexOf(this.filterText.toLowerCase()) > -1) {
-                    filteredData.push(next);
-                    break;
+                if (next[key] != null) {
+                    var value = next[key].toString().toLowerCase();
+
+                    if (value.indexOf(this.filterText.toLowerCase()) > -1) {
+                        filteredData.push(next);
+                        break;
+                    }
                 }
             }
         }

diff --git a/dist/es2015/au-table.js b/dist/es2015/au-table.js
@@ -140,11 +140,14 @@ export let AureliaTableCustomAttribute = (_dec = inject(BindingEngine), _dec2 =
 
         for (let next of toFilter) {
             for (let key of this.filterKeys) {
-                let value = next[key].toString();
 
-                if (value.toLowerCase().indexOf(this.filterText.toLowerCase()) > -1) {
-                    filteredData.push(next);
-                    break;
+                if (next[key] != null) {
+                    let value = next[key].toString().toLowerCase();
+
+                    if (value.indexOf(this.filterText.toLowerCase()) > -1) {
+                        filteredData.push(next);
+                        break;
+                    }
                 }
             }
         }

diff --git a/dist/system/au-table.js b/dist/system/au-table.js
@@ -188,11 +188,14 @@ System.register(["aurelia-framework"], function (_export, _context) {
 
                             var key = _ref2;
 
-                            var value = next[key].toString();
 
-                            if (value.toLowerCase().indexOf(this.filterText.toLowerCase()) > -1) {
-                                filteredData.push(next);
-                                break;
+                            if (next[key] != null) {
+                                var value = next[key].toString().toLowerCase();
+
+                                if (value.indexOf(this.filterText.toLowerCase()) > -1) {
+                                    filteredData.push(next);
+                                    break;
+                                }
                             }
                         }
                     }

diff --git a/src/au-table.js b/src/au-table.js
@@ -101,14 +101,17 @@ export class AureliaTableCustomAttribute {
 
     doFilter(toFilter) {
         let filteredData = [];
-
+        
         for (let next of toFilter) {
             for (let key of this.filterKeys) {
-                let value = next[key].toString();
 
-                if (value.toLowerCase().indexOf(this.filterText.toLowerCase()) > -1) {
-                    filteredData.push(next);
-                    break;
+                if( next[key]!= null ){
+                    let value = next[key].toString().toLowerCase();
+
+                    if (value.indexOf(this.filterText.toLowerCase()) > -1) {
+                        filteredData.push(next);
+                        break;
+                    }
                 }
             }
         }