feat($state): allow prevent syncUrl on failure

Check defaultPrevented before syncUrl on failure.
angular-ui · Mar 19, 2014 · 753060b · 753060b
1 parent 5ee8d1e
commit 753060b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/state.js b/src/state.js
@@ -946,8 +946,11 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory,           $
          * @param {Object} fromParams The params supplied to the `fromState`.
          * @param {Error} error The resolve error object.
          */
-        $rootScope.$broadcast('$stateChangeError', to.self, toParams, from.self, fromParams, error);
-        syncUrl();
+        evt = $rootScope.$broadcast('$stateChangeError', to.self, toParams, from.self, fromParams, error);
+
+        if (!evt.defaultPrevented) {
+            syncUrl();
+        }
 
         return $q.reject(error);
       });

diff --git a/test/stateSpec.js b/test/stateSpec.js
@@ -777,6 +777,21 @@ describe('state', function () {
       expect($state.current.name).toBe("about");
     }));
 
+    it('should not revert to last known working url on state change failure', inject(function ($state, $rootScope, $location, $q) {
+      $state.transitionTo("about");
+      $q.flush();
+
+      $rootScope.$on("$stateChangeError", function(event){
+          event.defaultPrevented = true;
+      });
+
+      $location.path("/resolve-fail");
+      $rootScope.$broadcast("$locationChangeSuccess");
+      $rootScope.$apply();
+
+      expect($location.path()).toBe("/resolve-fail");
+    }));
+
     it('should replace browser history when "replace" enabled', inject(function ($state, $rootScope, $location, $q) {
       var originalReplaceFn = $location.replace, replaceWasCalled = false;