Skip to content

Commit

Permalink
Merge branch 'feature/ui-router-config' of https://github.com/cloudma…
Browse files Browse the repository at this point in the history
…rk/ng2 into cloudmark-feature/ui-router-config
  • Loading branch information
christopherthielen committed Mar 5, 2017
2 parents 012e228 + 491373f commit c894fbc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/uiRouterConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {isDefined} from "ui-router-core";

export function applyModuleConfig(uiRouter: UIRouter, injector: Injector, options: StatesModule = {}): StateObject[] {
if (isFunction(options.config)) {
options.config(uiRouter, injector);
options.config(uiRouter, injector, options);
}

let states = options.states || [];
Expand Down
4 changes: 2 additions & 2 deletions src/uiRouterNgModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export interface StatesModule {
* import { requireAuthHook } from "./requireAuthHook";
* import { MyService } from "./myService";
*
* export function configureMyModule(uiRouter: UIRouter, injector: Injector) {
* export function configureMyModule(uiRouter: UIRouter, injector: Injector, options: StatesModule) {
* // Get UIRouter services off the UIRouter object
* let urlConfig = uiRouter.urlService.config;
* let transitionService = uiRouter.transitionService;
Expand Down Expand Up @@ -228,6 +228,6 @@ export interface StatesModule {
* class MyModule {}
* ```
*/
config?: (uiRouterInstance: UIRouter, injector: Injector) => any;
config?: (uiRouterInstance: UIRouter, injector: Injector, options: StatesModule) => any;
}

0 comments on commit c894fbc

Please sign in to comment.