Skip to content

Commit de36f2f

Browse files
refactor(ResolveContext): remove unnecessary 'resolveContext' parameter from getResolvablesForFn
1 parent 9f905f5 commit de36f2f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/resolve/resolveContext.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ export default class ResolveContext {
7070
}
7171

7272
/** Inspects a function `fn` for its dependencies. Returns an object containing any matching Resolvables */
73-
getResolvablesForFn(fn: IInjectable, resolveContext: ResolveContext = this): { [key: string]: Resolvable } {
73+
getResolvablesForFn(fn: IInjectable): { [key: string]: Resolvable } {
7474
let deps = runtime.$injector.annotate(<Function> fn);
75-
return <any> pick(resolveContext.getResolvables(), deps);
75+
return <any> pick(this.getResolvables(), deps);
7676
}
7777

7878
isolateRootTo(state: State): ResolveContext {
@@ -133,7 +133,7 @@ export default class ResolveContext {
133133
* @param options: options (TODO: document)
134134
*/
135135
invokeLater(fn: IInjectable, locals: any = {}, options: IOptions1 = {}): IPromise<any> {
136-
let resolvables = this.getResolvablesForFn(fn, this);
136+
let resolvables = this.getResolvablesForFn(fn);
137137
trace.tracePathElementInvoke(tail(this._path), fn, Object.keys(resolvables), extend({when: "Later"}, options));
138138
const getPromise = (resolvable: Resolvable) => resolvable.get(this, options);
139139
let promises: IPromises = <any> map(resolvables, getPromise);
@@ -163,7 +163,7 @@ export default class ResolveContext {
163163
// Injects a function at this PathElement level with available Resolvables
164164
// Does not wait until all Resolvables have been resolved; you must call PathElement.resolve() (or manually resolve each dep) first
165165
invokeNow(fn: IInjectable, locals: any, options: any = {}) {
166-
let resolvables = this.getResolvablesForFn(fn, this);
166+
let resolvables = this.getResolvablesForFn(fn);
167167
trace.tracePathElementInvoke(tail(this._path), fn, Object.keys(resolvables), extend({when: "Now "}, options));
168168
let resolvedLocals = map(resolvables, prop("data"));
169169
return runtime.$injector.invoke(<Function> fn, null, extend({}, locals, resolvedLocals));

src/transition/transitionHook.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default class TransitionHook {
4949
]);
5050

5151
invokeStep = (moreLocals) => {
52-
let { options, fn, resolveContext, state } = this;
52+
let { options, fn, resolveContext } = this;
5353
let locals = extend({}, this.locals, moreLocals);
5454
trace.traceHookInvocation(this, options);
5555
if (options.rejectIfSuperseded && this.isSuperseded()) {

0 commit comments

Comments
 (0)