Fix #83 Check layout for null before use.

akoenig · Sep 18, 2015 · 6658210 · 6658210
1 parent 7d58a6a
commit 6658210
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/angular-deckgrid.js b/angular-deckgrid.js
@@ -367,7 +367,7 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
             // Okay, the layout has changed.
             // Creating a new column structure is not avoidable.
             //
-            if (layout.columns !== this.$$scope.layout.columns) {
+            if (layout && layout.columns !== this.$$scope.layout.columns) {
                 self.$$scope.layout = layout;
 
                 self.$$scope.$apply(function onApply () {

diff --git a/angular-deckgrid.min.js b/angular-deckgrid.min.js
diff --git a/package.json b/package.json
@@ -11,9 +11,10 @@
   "devDependencies": {
     "grunt-contrib-uglify": "~0.2.2",
     "grunt-contrib-jshint": "~0.7.1",
-    "grunt": "~0.4.1"
-,    "grunt-contrib-concat": "~0.3.0",
+    "grunt": "~0.4.1",
+    "grunt-contrib-concat": "~0.3.0",
     "grunt-karma": "~0.7.1",
+    "karma": "~0.12.0",
     "karma-jasmine": "~0.1.5",
     "karma-chrome-launcher": "~0.1.2"
   },

diff --git a/src/deckgrid.js b/src/deckgrid.js
@@ -219,7 +219,7 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
             // Okay, the layout has changed.
             // Creating a new column structure is not avoidable.
             //
-            if (layout.columns !== this.$$scope.layout.columns) {
+            if (layout && layout.columns !== this.$$scope.layout.columns) {
                 self.$$scope.layout = layout;
 
                 self.$$scope.$apply(function onApply () {