BC-BREAK: Moved defaultErrorHandler from TransitionService to StateService

Author: christopherthielen

src/state/stateService.ts

@@ -299,9 +299,13 @@ export class StateService {
 
         if (error.type === RejectType.ABORTED) {
           router.urlRouter.update();
+          return services.$q.reject(error);
         }
       }
 
+      var errorHandler = this.defaultErrorHandler();
+      errorHandler(error);
+
       return services.$q.reject(error);
     };
 
@@ -474,6 +478,40 @@ export class StateService {
     });
   };
 
+  /** @hidden */
+  private _defaultErrorHandler: ((_error) => void) = function $defaultErrorHandler($error$) {
+    if ($error$ instanceof Error && $error$.stack) {
+      console.error($error$.stack);
+    } else {
+      console.error($error$);
+    }
+  };
+
+  /**
+   * Sets or gets the default [[transitionTo]] error handler.
+   *
+   * The error handler is called when a [[Transition]] is rejected or when any error occurred during the Transition.
+   * This includes errors caused by resolves and transition hooks.
+   *
+   * The built-in default error handler logs the error to the console.
+   *
+   * You can provide your own custom handler.
+   *
+   * @example
+   * ```js
+   *
+   * stateService.defaultErrorHandler(function() {
+   *   // Do not log transitionTo errors
+   * });
+   * ```
+   *
+   * @param handler a global error handler function
+   * @returns the current global error handler
+   */
+  defaultErrorHandler(handler?: (error) => void): (error) => void {
+    return this._defaultErrorHandler = handler || this._defaultErrorHandler;
+  }
+
   /**
    * @ngdoc function
    * @name ui.router.state.$state#get

src/transition/transitionService.ts

@@ -118,28 +118,6 @@ export class TransitionService implements IHookRegistry {
   /** @hidden */
   getHooks  : (hookName: string) => IEventHook[];
 
-  /** @hidden */
-  private _defaultErrorHandler: ((_error) => void) = function $defaultErrorHandler($error$) {
-    if ($error$ instanceof Error) {
-      console.error($error$);
-    }
-  };
-
-  /**
-   * Sets or gets the default transition error handler.
-   *
-   * The error handler is called when a [[Transition]] is rejected and when any error occurred during the Transition.
-   * This includes errors caused by resolves and transition hooks.
-   *
-   * The built-in default error handler logs thrown javascript Errors to the console.
-   *
-   * @param handler a global error handler function
-   * @returns the current global error handler
-   */
-  defaultErrorHandler(handler?: (error) => void): (error) => void {
-    return this._defaultErrorHandler = handler || this._defaultErrorHandler;
-  }
-
   /**
    * Creates a new [[Transition]] object
    *

test/ng1/stateSpec.js

@@ -10,11 +10,10 @@ describe('state', function () {
 
   var $injector, $stateProvider, locationProvider, templateParams, template, ctrlName, errors;
 
-  beforeEach(module('ui.router', function($locationProvider, $transitionsProvider) {
+  beforeEach(module('ui.router', function($locationProvider) {
     errors = [];
     locationProvider = $locationProvider;
     $locationProvider.html5Mode(false);
-    $transitionsProvider.defaultErrorHandler(function(error) { errors.push(error); } );
   }));
 
   var log, logEvents, logEnterExit;
@@ -169,7 +168,8 @@ describe('state', function () {
     $provide.value('AppInjectable', AppInjectable);
   }));
 
-  beforeEach(inject(function (_$injector_) {
+  beforeEach(inject(function (_$injector_, $state) {
+    $state.defaultErrorHandler(function(error) { errors.push(error); } );
     $injector = _$injector_;
     log = '';
     logEvents = logEnterExit = false;
@@ -1855,7 +1855,7 @@ describe('exceptions in onEnter', function() {
   // Test for #2772
   it('trigger transition.onError', inject(function ($state, $q, $transitions) {
     var called;
-    $transitions.defaultErrorHandler(function() { });
+    $state.defaultErrorHandler(function() { });
     $transitions.onError({}, function() {
       called = true;
     });