Merge pull request #296 from Demeterr/keep-otherwise-last

Keep $urlRouterProvider.otherwise() handling last (was #281).

Author: nateabele

src/urlRouter.js

@@ -86,18 +86,22 @@ function $UrlRouterProvider(  $urlMatcherFactory) {
   this.$get =
     [        '$location', '$rootScope', '$injector',
     function ($location,   $rootScope,   $injector) {
-      if (otherwise) rules.push(otherwise);
-
       // TODO: Optimize groups of rules with non-empty prefix into some sort of decision tree
       function update() {
-        var n=rules.length, i, handled;
-        for (i=0; i<n; i++) {
-          handled = rules[i]($injector, $location);
+        function check(rule) {
+          var handled = rule($injector, $location);
           if (handled) {
             if (isString(handled)) $location.replace().url(handled);
-            break;
+            return true;
           }
+          return false;
+        }
+        var n=rules.length, i;
+        for (i=0; i<n; i++) {
+          if (check(rules[i])) return;
         }
+        // always check otherwise last to allow dynamic updates to the set of rules
+        if (otherwise) check(otherwise);
       }
 
       $rootScope.$on('$locationChangeSuccess', update);

test/urlRouterSpec.js

@@ -7,13 +7,13 @@ describe("UrlRouter", function () {
       $urp = $urlRouterProvider;
 
       $urp.rule(function ($injector, $location) {
-        return $location.path().replace('baz', 'b4z');
+        var path = $location.path();
+        if (!/baz/.test(path)) return false;
+        return path.replace('baz', 'b4z');
       }).when('/foo/:param', function($match) {
         match = ['/foo/:param', $match];
       }).when('/bar', function($match) {
         match = ['/bar', $match];
-      }).when('/:param', function($match) {
-        match = ['/:param', $match];
       });
     });
 
@@ -45,6 +45,22 @@ describe("UrlRouter", function () {
       scope.$emit("$locationChangeSuccess");
       expect(location.path()).toBe("/b4z");
     });
+
+    it("should keep otherwise last", function () {
+      $urp.otherwise('/otherwise');
+
+      location.path("/lastrule");
+      scope.$emit("$locationChangeSuccess");
+      expect(location.path()).toBe("/otherwise");
+
+      $urp.when('/lastrule', function($match) {
+        match = ['/lastrule', $match];
+      });
+
+      location.path("/lastrule");
+      scope.$emit("$locationChangeSuccess");
+      expect(location.path()).toBe("/lastrule");
+    });
   });
 
-});
+});