Fixed #2615

primefaces · Apr 28, 2017 · 2b62560 · 2b62560
1 parent 75e4b26
commit 2b62560
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/components/datatable/datatable.ts b/components/datatable/datatable.ts
@@ -1590,10 +1590,15 @@ export class DataTable implements AfterViewChecked,AfterViewInit,AfterContentIni
             }
         }
 
-        if(this.domHandler.hasClass(prevCell, 'ui-editable-column'))
-            return prevCell;
-        else
-            return this.findPreviousEditableColumn(prevCell);
+        if(prevCell) {
+            if(this.domHandler.hasClass(prevCell, 'ui-editable-column'))
+                return prevCell;
+            else
+                return this.findPreviousEditableColumn(prevCell);
+        }
+        else {
+            return null;
+        }
     }
 
     findNextEditableColumn(cell: Element) {
@@ -1606,10 +1611,15 @@ export class DataTable implements AfterViewChecked,AfterViewInit,AfterContentIni
             }
         }
 
-        if(this.domHandler.hasClass(nextCell, 'ui-editable-column'))
-            return nextCell;
-        else
-            return this.findNextEditableColumn(nextCell);
+        if(nextCell) {
+            if(this.domHandler.hasClass(nextCell, 'ui-editable-column'))
+                return nextCell;
+            else
+                return this.findNextEditableColumn(nextCell);
+        }
+        else {
+            return null;
+        }
     }
 
     onCustomEditorFocusPrev(event: KeyboardEvent) {