fix(rows): Fix "deregisterFunction is not a function" error

Close #627
angular-gantt · Sep 30, 2016 · e7d0e44 · e7d0e44
1 parent b1b4223
commit e7d0e44
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/assets/angular-gantt.js b/assets/angular-gantt.js
diff --git a/demo/dist/scripts/vendor.js b/demo/dist/scripts/vendor.js
@@ -51053,8 +51053,10 @@ Github: https://github.com/angular-gantt/angular-gantt.git
                 var indexOf = arrays.indexOfId(this.rows, rowId, ['model', 'id']);
                 if (indexOf > -1) {
                     removedRow = this.rows.splice(indexOf, 1)[0]; // Remove from array
-                    var deregisterFunction = this.rowsTaskWatchers.splice(indexOf, 1)[0]; // Remove watcher
-                    deregisterFunction();
+                    var unregisterFunction = this.rowsTaskWatchers.splice(indexOf, 1)[0]; // Remove watcher
+                    if (unregisterFunction) {
+                        unregisterFunction();
+                    }
                 }
 
                 arrays.removeId(this.sortedRows, rowId, ['model', 'id']);
@@ -51078,8 +51080,8 @@ Github: https://github.com/angular-gantt/angular-gantt.git
             this.visibleRows = [];
 
             for (var i = 0, l = this.rowsTaskWatchers.length; i < l; i++) {
-                var deregisterFunction = this.rowsTaskWatchers[i];
-                deregisterFunction();
+                var unregisterFunction = this.rowsTaskWatchers[i];
+                unregisterFunction();
             }
             this.rowsTaskWatchers = [];
         };

diff --git a/src/core/logic/row/rowsManager.factory.js b/src/core/logic/row/rowsManager.factory.js
@@ -191,8 +191,10 @@
                 var indexOf = arrays.indexOfId(this.rows, rowId, ['model', 'id']);
                 if (indexOf > -1) {
                     removedRow = this.rows.splice(indexOf, 1)[0]; // Remove from array
-                    var deregisterFunction = this.rowsTaskWatchers.splice(indexOf, 1)[0]; // Remove watcher
-                    deregisterFunction();
+                    var unregisterFunction = this.rowsTaskWatchers.splice(indexOf, 1)[0]; // Remove watcher
+                    if (unregisterFunction) {
+                        unregisterFunction();
+                    }
                 }
 
                 arrays.removeId(this.sortedRows, rowId, ['model', 'id']);
@@ -216,8 +218,8 @@
             this.visibleRows = [];
 
             for (var i = 0, l = this.rowsTaskWatchers.length; i < l; i++) {
-                var deregisterFunction = this.rowsTaskWatchers[i];
-                deregisterFunction();
+                var unregisterFunction = this.rowsTaskWatchers[i];
+                unregisterFunction();
             }
             this.rowsTaskWatchers = [];
         };