Merge pull request #36 from paivaric/master

Fix null exception on function $routeSegment.contains
artch · May 8, 2014 · 990982b · 990982b
2 parents 1e238d0 + 50366e4
commit 990982b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-route-segment",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "main": "build/angular-route-segment.js",
   "ignore": [
     "**/.*",

diff --git a/build/angular-route-segment.js b/build/angular-route-segment.js
@@ -183,7 +183,7 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
                  */
                 contains: function (val) {
                     for(var i=0; i<this.chain.length; i++)
-                        if(this.chain[i].name == val)
+                        if(this.chain[i] && this.chain[i].name == val)
                             return true;
                     return false;
                 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-route-segment",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "dependencies": {
         "grunt": "",
         "grunt-contrib-uglify": "",

diff --git a/src/route-segment.js b/src/route-segment.js
@@ -177,7 +177,7 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
                  */
                 contains: function (val) {
                     for(var i=0; i<this.chain.length; i++)
-                        if(this.chain[i].name == val)
+                        if(this.chain[i] && this.chain[i].name == val)
                             return true;
                     return false;
                 }