Skip to content

Commit 59cb067

Browse files
committedDec 23, 2017
fix(trace): Fix null reference in uiview name sort function
Closes #100
1 parent c9b1a52 commit 59cb067

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed
 

‎src/common/trace.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,13 @@ export class Trace {
229229
/** @internalapi called by ui-router code */
230230
traceViewSync(pairs: ViewTuple[]) {
231231
if (!this.enabled(Category.VIEWCONFIG)) return;
232+
const uivheader = 'uiview component fqn';
233+
const cfgheader = 'view config state (view name)';
232234
const mapping = pairs.map(({ uiView, viewConfig }) => {
233235
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] || ''));
238239

239240
consoletable(mapping);
240241
}

‎src/view/view.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,15 @@ export class ViewService {
223223
const uiViewTuples = this._uiViews.sort(depthCompare(uiViewDepth, 1)).map(matchingConfigPair);
224224
const matchedViewConfigs = uiViewTuples.map(tuple => tuple.viewConfig);
225225
const unmatchedConfigTuples = this._viewConfigs
226-
.filter(config => inArray(matchedViewConfigs, config))
226+
.filter(config => !inArray(matchedViewConfigs, config))
227227
.map(viewConfig => ({ uiView: undefined, viewConfig }));
228228

229-
const allTuples: ViewTuple[] = uiViewTuples.concat(unmatchedConfigTuples);
230-
231229
uiViewTuples.forEach(configureUIView);
232230

231+
const allTuples: ViewTuple[] = uiViewTuples.concat(unmatchedConfigTuples);
233232
this._listeners.forEach(cb => cb(allTuples));
234233
trace.traceViewSync(allTuples);
235-
};
234+
}
236235

237236
/**
238237
* Registers a `ui-view` component

0 commit comments

Comments
 (0)
Please sign in to comment.