@@ -122,9 +122,7 @@ export function objectFactory() {
122
122
*/
123
123
@Component ( {
124
124
selector : 'ui-view-ng-upgrade' ,
125
- template : `
126
- <ui-view [name]="name"></ui-view>
127
- ` ,
125
+ template : ` <ui-view [name]="name"></ui-view> ` ,
128
126
// provide a blank object as PARENT_INJECT.
129
127
// The component will add property getters when it is constructed.
130
128
viewProviders : [ { provide : UIView . PARENT_INJECT , useFactory : objectFactory } ] ,
@@ -145,23 +143,20 @@ export class UIViewNgUpgrade {
145
143
146
144
// The ng2 ui-view component is inside this ui-view-ng-upgrade directive, which is inside the ng1 "host" ui-view.
147
145
// Both ui-views share the same "view context" information (the view's fqn and created-by-state context information)
148
- const ng1elem = angular
149
- . element ( ref . nativeElement )
150
- . parent ( )
151
- . parent ( ) ;
146
+ const ng1elem = angular . element ( ref . nativeElement ) . parent ( ) . parent ( ) ;
152
147
153
148
// Expose getters on PARENT_INJECT for context (creation state) and fqn (view address)
154
149
// These will be used by further nested UIView
155
150
Object . defineProperty ( parent , 'context' , {
156
- get : function ( ) {
151
+ get : function ( ) {
157
152
const data = ng1elem [ 'inheritedData' ] ( '$uiView' ) ;
158
153
return data && data . $cfg ? data . $cfg . viewDecl . $context : registry . root ( ) ;
159
154
} ,
160
155
enumerable : true ,
161
156
} ) ;
162
157
163
158
Object . defineProperty ( parent , 'fqn' , {
164
- get : function ( ) {
159
+ get : function ( ) {
165
160
const data = ng1elem [ 'inheritedData' ] ( '$uiView' ) ;
166
161
return data && data . $uiView ? data . $uiView . fqn : null ;
167
162
} ,
@@ -177,7 +172,7 @@ export class UIViewNgUpgrade {
177
172
// Register the ng1 DI '$uiRouter' object as an ng2 Provider.
178
173
export function uiRouterUpgradeFactory ( router : UIRouter , injector : Injector ) {
179
174
const modules : StatesModule [ ] = injector . get < StatesModule [ ] > ( UIROUTER_MODULE_TOKEN , [ ] ) ;
180
- modules . forEach ( module => applyModuleConfig ( router , injector , module ) ) ;
175
+ modules . forEach ( ( module ) => applyModuleConfig ( router , injector , module ) ) ;
181
176
return router ;
182
177
}
183
178
@@ -211,14 +206,14 @@ export function getParentUIViewInject(r: StateRegistry): ParentUIViewInject {
211
206
exports : [ UIViewNgUpgrade , UIRouterModule ] ,
212
207
} )
213
208
export class UIRouterUpgradeModule {
214
- static forRoot ( module : NgHybridStatesModule = { } ) : ModuleWithProviders {
209
+ static forRoot ( module : NgHybridStatesModule = { } ) : ModuleWithProviders < UIRouterUpgradeModule > {
215
210
return {
216
211
ngModule : UIRouterUpgradeModule ,
217
212
providers : makeChildProviders ( module as StatesModule ) ,
218
213
} ;
219
214
}
220
215
221
- static forChild ( module : NgHybridStatesModule = { } ) : ModuleWithProviders {
216
+ static forChild ( module : NgHybridStatesModule = { } ) : ModuleWithProviders < UIRouterUpgradeModule > {
222
217
return {
223
218
ngModule : UIRouterModule ,
224
219
providers : makeChildProviders ( module as StatesModule ) ,
@@ -229,10 +224,13 @@ export class UIRouterUpgradeModule {
229
224
// Downgrade the UIViewNgUpgrade ng2 Component to an ng1 directive.
230
225
// The directive is used in a (generated) view template by the (host) ng1 ui-router,
231
226
// whenever it finds a view configured with a `component: <Ng2ComponentClass>`
232
- upgradeModule . directive ( 'uiViewNgUpgrade' , < any > downgradeComponent ( {
233
- component : UIViewNgUpgrade ,
234
- inputs : [ 'name' ] ,
235
- } ) ) ;
227
+ upgradeModule . directive (
228
+ 'uiViewNgUpgrade' ,
229
+ < any > downgradeComponent ( {
230
+ component : UIViewNgUpgrade ,
231
+ inputs : [ 'name' ] ,
232
+ } )
233
+ ) ;
236
234
237
235
upgradeModule . run ( [
238
236
'$injector' ,
@@ -246,7 +244,7 @@ upgradeModule.run([
246
244
// This mimics how ui-router-ng2 exposes the root ng2 Injector, but
247
245
// it retrieves from ng1 injector first, then ng2 injector if the token isn't found.
248
246
const mergedInjector = {
249
- get : function ( token : any , ng2NotFoundValue ?: any ) {
247
+ get : function ( token : any , ng2NotFoundValue ?: any ) {
250
248
if ( ng1Injector . has ( token ) ) {
251
249
return ng1Injector . get ( token ) ;
252
250
}
@@ -280,7 +278,7 @@ upgradeModule.config([
280
278
upgradeModule . config ( [
281
279
'$stateRegistryProvider' ,
282
280
( $stateRegistry : StateRegistry ) => {
283
- $stateRegistry . decorator ( 'views' , function ( state : StateObject , parentFn : Function ) {
281
+ $stateRegistry . decorator ( 'views' , function ( state : StateObject , parentFn : Function ) {
284
282
const views = parentFn ( state ) ;
285
283
286
284
forEach ( views , ( viewDecl : any , viewName : string ) => {
0 commit comments