Version 2.0.10 release

Closes angular-ui#1142
Baart · Apr 25, 2014 · c50e29d · c50e29d
1 parent 955c672
commit c50e29d
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+<a name="2.0.10"></a>
+## 2.0.10 *(2014-04-25)*
+
+* Fix bug with $groupPanel $destroy handler (thanks @mikeromano38) (52de35530360d51).
+
 <a name="2.0.9"></a>
 ## 2.0.9 *(2014-04-23)*
 

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Dependencies: jQuery & angular.js. (JqueryUi draggable for non-HTML5 compliant b
 ## About
 __ng-grid__ Originally built on knockout we wanted to port it to angular.
 
-version 2.0.9
+version 2.0.10
 
 [nuGet](https://nuget.org/packages/ng-grid)
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-grid",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "homepage": "https://github.com/angular-ui/ng-grid",
   "description": "Angular data grid",
   "keywords": [

diff --git a/build/ng-grid.debug.js b/build/ng-grid.debug.js
@@ -2,7 +2,7 @@
 * ng-grid JavaScript Library
 * Authors: https://github.com/angular-ui/ng-grid/blob/master/README.md 
 * License: MIT (http://www.opensource.org/licenses/mit-license.php)
-* Compiled At: 04/23/2014 09:12
+* Compiled At: 04/25/2014 12:13
 ***********************************************/
 (function(window, $) {
 'use strict';
@@ -278,6 +278,9 @@ angular.module('ngGrid.services').factory('$domUtilityService',['$utilityService
         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();
@@ -995,7 +998,9 @@ var ngEventProvider = function (grid, $scope, domUtilityService, $timeout) {
             grid.$topPanel.on('mousedown', '.ngHeaderScroller', self.onHeaderMouseDown).on('dragover', '.ngHeaderScroller', self.dragOver);
 
             grid.$groupPanel.on('$destroy', function() {
-                grid.$groupPanel.off('mousedown');
+                if (grid.$groupPanel){
+                    grid.$groupPanel.off('mousedown');
+                }
 
                 grid.$groupPanel = null;
             });
@@ -1005,9 +1010,11 @@ var ngEventProvider = function (grid, $scope, domUtilityService, $timeout) {
             }
 
             grid.$topPanel.on('$destroy', function() {
-                grid.$topPanel.off('mousedown');
+                if (grid.$topPanel){
+                    grid.$topPanel.off('mousedown');
+                }
 
-                if (grid.config.enableColumnReordering) {
+                if (grid.config.enableColumnReordering && grid.$topPanel) {
                     grid.$topPanel.off('drop');
                 }
 

diff --git a/build/ng-grid.js b/build/ng-grid.js
@@ -2,7 +2,7 @@
 * ng-grid JavaScript Library
 * Authors: https://github.com/angular-ui/ng-grid/blob/master/README.md 
 * License: MIT (http://www.opensource.org/licenses/mit-license.php)
-* Compiled At: 04/23/2014 09:12
+* Compiled At: 04/25/2014 12:13
 ***********************************************/
 (function(window, $) {
 'use strict';
@@ -258,6 +258,9 @@ angular.module('ngGrid.services').factory('$domUtilityService',['$utilityService
         return width;
     };
     domUtilityService.UpdateGridLayout = function($scope, grid) {
+        if (!grid.$root){
+            return;
+        }
         var scrollTop = grid.$viewport.scrollTop();
         grid.elementDims.rootMaxW = grid.$root.width();
         if (grid.$root.is(':hidden')) {
@@ -939,7 +942,9 @@ var ngEventProvider = function (grid, $scope, domUtilityService, $timeout) {
             grid.$topPanel.on('mousedown', '.ngHeaderScroller', self.onHeaderMouseDown).on('dragover', '.ngHeaderScroller', self.dragOver);
 
             grid.$groupPanel.on('$destroy', function() {
-                grid.$groupPanel.off('mousedown');
+                if (grid.$groupPanel){
+                    grid.$groupPanel.off('mousedown');
+                }
 
                 grid.$groupPanel = null;
             });
@@ -949,9 +954,11 @@ var ngEventProvider = function (grid, $scope, domUtilityService, $timeout) {
             }
 
             grid.$topPanel.on('$destroy', function() {
-                grid.$topPanel.off('mousedown');
+                if (grid.$topPanel){
+                    grid.$topPanel.off('mousedown');
+                }
 
-                if (grid.config.enableColumnReordering) {
+                if (grid.config.enableColumnReordering && grid.$topPanel) {
                     grid.$topPanel.off('drop');
                 }
 

diff --git a/build/ng-grid.min.js b/build/ng-grid.min.js
diff --git a/ng-grid-2.0.9.debug.js → ng-grid-2.0.10.debug.js b/ng-grid-2.0.9.debug.js → ng-grid-2.0.10.debug.js
@@ -2,7 +2,7 @@
 * ng-grid JavaScript Library
 * Authors: https://github.com/angular-ui/ng-grid/blob/master/README.md 
 * License: MIT (http://www.opensource.org/licenses/mit-license.php)
-* Compiled At: 04/23/2014 09:12
+* Compiled At: 04/25/2014 12:13
 ***********************************************/
 (function(window, $) {
 'use strict';
@@ -278,6 +278,9 @@ angular.module('ngGrid.services').factory('$domUtilityService',['$utilityService
         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();
@@ -995,7 +998,9 @@ var ngEventProvider = function (grid, $scope, domUtilityService, $timeout) {
             grid.$topPanel.on('mousedown', '.ngHeaderScroller', self.onHeaderMouseDown).on('dragover', '.ngHeaderScroller', self.dragOver);
 
             grid.$groupPanel.on('$destroy', function() {
-                grid.$groupPanel.off('mousedown');
+                if (grid.$groupPanel){
+                    grid.$groupPanel.off('mousedown');
+                }
 
                 grid.$groupPanel = null;
             });
@@ -1005,9 +1010,11 @@ var ngEventProvider = function (grid, $scope, domUtilityService, $timeout) {
             }
 
             grid.$topPanel.on('$destroy', function() {
-                grid.$topPanel.off('mousedown');
+                if (grid.$topPanel){
+                    grid.$topPanel.off('mousedown');
+                }
 
-                if (grid.config.enableColumnReordering) {
+                if (grid.config.enableColumnReordering && grid.$topPanel) {
                     grid.$topPanel.off('drop');
                 }
 

diff --git a/ng-grid-2.0.9.min.js → ng-grid-2.0.10.min.js b/ng-grid-2.0.9.min.js → ng-grid-2.0.10.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-grid",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "main": "ng-grid.min.js",
   "directories": {
     "test": "test"