fix "TypeError: Cannot read property 'off' of null"

avantgarde-labs · Apr 24, 2014 · 17f093f · 17f093f
1 parent 04c1848
commit 17f093f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/classes/eventProvider.js b/src/classes/eventProvider.js
@@ -21,7 +21,7 @@
             grid.$topPanel.on('mousedown', '.ngHeaderScroller', self.onHeaderMouseDown).on('dragover', '.ngHeaderScroller', self.dragOver);
 
             grid.$groupPanel.on('$destroy', function() {
-                grid.$groupPanel.off('mousedown');
+                grid.$groupPanel && grid.$groupPanel.off('mousedown');
 
                 grid.$groupPanel = null;
             });
@@ -31,10 +31,10 @@
             }
 
             grid.$topPanel.on('$destroy', function() {
-                grid.$topPanel.off('mousedown');
+                grid.$topPanel && grid.$topPanel.off('mousedown');
 
                 if (grid.config.enableColumnReordering) {
-                    grid.$topPanel.off('drop');
+                    grid.$topPanel && grid.$topPanel.off('drop');
                 }
 
                 grid.$topPanel = null;
@@ -45,7 +45,7 @@
             $timeout(self.setDraggables);
         }));
     };
-    self.dragStart = function(evt){		
+    self.dragStart = function(evt){
       //FireFox requires there to be dataTransfer if you want to drag and drop.
       evt.dataTransfer.setData('text', ''); //cannot be empty string
     };
@@ -75,9 +75,9 @@
             if (navigator.userAgent.indexOf("MSIE") !== -1){
                 //call native IE dragDrop() to start dragging
                 var sortColumn = grid.$root.find('.ngHeaderSortColumn');
-                sortColumn.bind('selectstart', function () { 
-                    this.dragDrop(); 
-                    return false; 
+                sortColumn.bind('selectstart', function () {
+                    this.dragDrop();
+                    return false;
                 });
                 angular.element(sortColumn).on('$destroy', function() {
                     sortColumn.off('selectstart');
@@ -111,17 +111,17 @@
                 if (!grid.config.jqueryUIDraggable) {
                     groupItem.attr('draggable', 'true');
                     if(this.addEventListener){//IE8 doesn't have drag drop or event listeners
-                        this.addEventListener('dragstart', self.dragStart); 
+                        this.addEventListener('dragstart', self.dragStart);
 
                         angular.element(this).on('$destroy', function() {
-                            this.removeEventListener('dragstart', self.dragStart); 
+                            this.removeEventListener('dragstart', self.dragStart);
                         });
                     }
                     if (navigator.userAgent.indexOf("MSIE") !== -1){
                         //call native IE dragDrop() to start dragging
-                        groupItem.bind('selectstart', function () { 
-                            this.dragDrop(); 
-                            return false; 
+                        groupItem.bind('selectstart', function () {
+                            this.dragDrop();
+                            return false;
                         });
 
                         groupItem.on('$destroy', function() {
@@ -216,7 +216,7 @@
     self.assignGridEventHandlers = function() {
         //Chrome and firefox both need a tab index so the grid can recieve focus.
         //need to give the grid a tabindex if it doesn't already have one so
-        //we'll just give it a tab index of the corresponding gridcache index 
+        //we'll just give it a tab index of the corresponding gridcache index
         //that way we'll get the same result every time it is run.
         //configurable within the options.
         if (grid.config.tabIndex === -1) {

diff --git a/src/services/DomUtilityService.js b/src/services/DomUtilityService.js
@@ -70,6 +70,7 @@
         return width;
     };
     domUtilityService.UpdateGridLayout = function($scope, grid) {
+        if (!grid.$root) return;
         //catch this so we can return the viewer to their original scroll after the resize!
         var scrollTop = grid.$viewport.scrollTop();
         grid.elementDims.rootMaxW = grid.$root.width();
@@ -163,4 +164,4 @@
     domUtilityService.LetterW = 10;
     getWidths();
     return domUtilityService;
-}]);
+}]);