File tree 2 files changed +8
-8
lines changed
2 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -229,12 +229,13 @@ export class Trace {
229
229
/** @internalapi called by ui-router code */
230
230
traceViewSync ( pairs : ViewTuple [ ] ) {
231
231
if ( ! this . enabled ( Category . VIEWCONFIG ) ) return ;
232
+ const uivheader = 'uiview component fqn' ;
233
+ const cfgheader = 'view config state (view name)' ;
232
234
const mapping = pairs . map ( ( { uiView, viewConfig } ) => {
233
235
const uiv = uiView && uiView . fqn ;
234
- const cfg = viewConfig && `${ viewConfig . viewDecl . $context . name } : ${ viewConfig . viewDecl . $name } ` ;
235
-
236
- return { 'ui-view fqn' : uiv , 'state: view name' : cfg } ;
237
- } ) . sort ( ( a , b ) => a [ 'ui-view fqn' ] . localeCompare ( b [ 'ui-view fqn' ] ) ) ;
236
+ const cfg = viewConfig && `${ viewConfig . viewDecl . $context . name } : (${ viewConfig . viewDecl . $name } )` ;
237
+ return { [ uivheader ] : uiv , [ cfgheader ] : cfg } ;
238
+ } ) . sort ( ( a , b ) => ( a [ uivheader ] || '' ) . localeCompare ( b [ uivheader ] || '' ) ) ;
238
239
239
240
consoletable ( mapping ) ;
240
241
}
Original file line number Diff line number Diff line change @@ -223,16 +223,15 @@ export class ViewService {
223
223
const uiViewTuples = this . _uiViews . sort ( depthCompare ( uiViewDepth , 1 ) ) . map ( matchingConfigPair ) ;
224
224
const matchedViewConfigs = uiViewTuples . map ( tuple => tuple . viewConfig ) ;
225
225
const unmatchedConfigTuples = this . _viewConfigs
226
- . filter ( config => inArray ( matchedViewConfigs , config ) )
226
+ . filter ( config => ! inArray ( matchedViewConfigs , config ) )
227
227
. map ( viewConfig => ( { uiView : undefined , viewConfig } ) ) ;
228
228
229
- const allTuples : ViewTuple [ ] = uiViewTuples . concat ( unmatchedConfigTuples ) ;
230
-
231
229
uiViewTuples . forEach ( configureUIView ) ;
232
230
231
+ const allTuples : ViewTuple [ ] = uiViewTuples . concat ( unmatchedConfigTuples ) ;
233
232
this . _listeners . forEach ( cb => cb ( allTuples ) ) ;
234
233
trace . traceViewSync ( allTuples ) ;
235
- } ;
234
+ }
236
235
237
236
/**
238
237
* Registers a `ui-view` component
You can’t perform that action at this time.
0 commit comments