cherry-pick a1f0755 from 0.2.17

Author: scooper91

src/ng1/stateEvents.ts

@@ -64,11 +64,11 @@ import {Transition} from "../transition/transition";
     let fromParams = $transition$.params("from");
 
     if (enabledEvents.$stateChangeSuccess) {
-      let startEvent = $rootScope.$broadcast('$stateChangeStart', $transition$.to(), toParams, $transition$.from(), fromParams, $transition$);
+      let startEvent = $rootScope.$broadcast('$stateChangeStart', $transition$.to(), toParams, $transition$.from(), fromParams, $transition$.options(), $transition$);
 
       if (startEvent.defaultPrevented) {
         if (enabledEvents.$stateChangeCancel) {
-          $rootScope.$broadcast('$stateChangeCancel', $transition$.to(), toParams, $transition$.from(), fromParams, $transition$);
+          $rootScope.$broadcast('$stateChangeCancel', $transition$.to(), toParams, $transition$.from(), fromParams, $transition$.options(), $transition$);
         }
         //Don't update and resync url if there's been a new transition started. see issue #2238, #600
         if ($state.transition == null) $urlRouter.update();
@@ -90,7 +90,7 @@ import {Transition} from "../transition/transition";
          * @param from
          * @param fromParams
          */
-        $rootScope.$broadcast('$stateChangeSuccess', $transition$.to(), toParams, $transition$.from(), fromParams);
+        $rootScope.$broadcast('$stateChangeSuccess', $transition$.to(), toParams, $transition$.from(), fromParams, $transition$.options(), $transition$);
       });
     }
 
@@ -117,7 +117,7 @@ import {Transition} from "../transition/transition";
          * @param {Object} fromParams The params supplied to the `fromState`.
          * @param {Error} error The resolve error object.
          */
-        let evt = $rootScope.$broadcast('$stateChangeError', $transition$.to(), toParams, $transition$.from(), fromParams, error);
+        let evt = $rootScope.$broadcast('$stateChangeError', $transition$.to(), toParams, $transition$.from(), fromParams, error, $transition$.options(), $transition$);
 
         if (!evt.defaultPrevented) {
           $urlRouter.update();

test/stateEventsSpec.js

@@ -62,18 +62,18 @@ describe('UI-Router v0.2.x $state events', function () {
     return $injector.get(what);
   }
 
-  function initStateTo(state, params) {
+  function initStateTo(state, optionalParams, optionalOptions) {
     var $state = $get('$state'), $q = $get('$q');
-    $state.transitionTo(state, params || {});
+    $state.transitionTo(state, optionalParams || {}, optionalOptions || {});
     $q.flush();
     expect($state.current).toBe(state);
   }
 
   describe('.transitionTo()', function () {
     it('triggers $stateChangeStart', inject(function ($state, $q, $rootScope) {
-      initStateTo(E, {i: 'iii'});
+      initStateTo(E, {i: 'iii'}, { anOption: true });
       var called;
-      $rootScope.$on('$stateChangeStart', function (ev, to, toParams, from, fromParams) {
+      $rootScope.$on('$stateChangeStart', function (ev, to, toParams, from, fromParams, options) {
         expect(from).toBe(E);
 
         expect(obj(fromParams)).toEqual({i: 'iii'});
@@ -82,11 +82,13 @@ describe('UI-Router v0.2.x $state events', function () {
 
         expect(obj(toParams)).toEqual({x: '1', y: '2'});
 
+        expect(options.custom.anOption).toBe(false);
+
         expect($state.current).toBe(from); // $state not updated yet
         expect(obj($state.params)).toEqual(obj(fromParams));
         called = true;
       });
-      $state.transitionTo(D, {x: '1', y: '2'});
+      $state.transitionTo(D, {x: '1', y: '2'}, { custom: { anOption: false } });
       $q.flush();
       expect(called).toBeTruthy();
       expect($state.current).toBe(D);