feat(Transition): Add the transition source (url/sref) to TransitionO…

…ptions
angular-ui · Aug 31, 2016 · 5d42d79 · 5d42d79
1 parent 8d6090e
commit 5d42d79
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/src/ng1/directives/stateDirectives.ts b/src/ng1/directives/stateDirectives.ts
@@ -78,7 +78,11 @@ function clickHook(el: IAugmentedJQuery, $state: StateService, $timeout: ITimeou
 
 /** @hidden */
 function defaultOpts(el: IAugmentedJQuery, $state: StateService) {
-  return { relative: stateContext(el) || $state.$current, inherit: true };
+  return {
+    relative: stateContext(el) || $state.$current,
+    inherit: true,
+    source: "sref"
+  };
 }
 
 /**

diff --git a/src/ng2/directives/uiSref.ts b/src/ng2/directives/uiSref.ts
@@ -88,7 +88,11 @@ export class UISref {
   }
 
   getOptions() {
-    let defOpts = { relative: this.parent && this.parent.context && this.parent.context.name, inherit: true };
+    let defOpts: TransitionOptions = { 
+      relative: this.parent && this.parent.context && this.parent.context.name,
+      inherit: true ,
+      source: "sref"
+    };
     return extend(defOpts, this.options || {});
   }
 

diff --git a/src/state/stateQueueManager.ts b/src/state/stateQueueManager.ts
@@ -96,7 +96,7 @@ export class StateQueueManager {
 
     $urlRouterProvider.when(state.url, ['$match', '$stateParams', function ($match: RawParams, $stateParams: RawParams) {
       if ($state.$current.navigable !== state || !equalForKeys($match, $stateParams)) {
-        $state.transitionTo(state, $match, { inherit: true, location: false });
+        $state.transitionTo(state, $match, { inherit: true, location: false, source: "url" });
       }
     }]);
   }

diff --git a/src/transition/interface.ts b/src/transition/interface.ts
@@ -73,12 +73,14 @@ export interface TransitionOptions {
    * You can define your own Transition Options inside this property and use them, e.g., from a Transition Hook
    */
   custom      ?: any;
-  /** @internal */
+  /** @hidden @internal */
   reloadState ?: (State);
-  /** @internal */
+  /** @hidden @internal */
   previous    ?: Transition;
-  /** @internal */
+  /** @hidden @internal */
   current     ?: () => Transition;
+  /** @hidden @internal */
+  source      ?: "sref"|"url"|"unknown";
 }
 
 /** @hidden @internal */

diff --git a/src/transition/transitionService.ts b/src/transition/transitionService.ts
@@ -32,7 +32,8 @@ export let defaultTransOpts: TransitionOptions = {
   notify      : true,
   reload      : false,
   custom      : {},
-  current     : () => null
+  current     : () => null,
+  source      : "unknown"
 };
 
 /**

diff --git a/test/matchers.ts b/test/matchers.ts
@@ -1,5 +1,6 @@
 /// <reference path='../typings/jasmine/jasmine.d.ts' />
 import {equals} from "../src/common/common";
+declare var testablePromise;
 
 beforeEach(function() {
   jasmine.addMatchers(<any> {