X Tutup
Skip to content

Commit 04b4035

Browse files
vicbvicb
committed
refactor(AppViewListener): prefix listener with on for consistency
Closes angular#3925
1 parent 608cdc4 commit 04b4035

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

‎modules/angular2/src/core/debug/debug_element_view_listener.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class DebugElementViewListener implements AppViewListener {
5050
DOM.setGlobalVar(INSPECT_GLOBAL_NAME, inspectNativeElement);
5151
}
5252

53-
viewCreated(view: AppView) {
53+
onViewCreated(view: AppView) {
5454
var viewId = _nextId++;
5555
_allViewsById.set(viewId, view);
5656
_allIdsByView.set(view, viewId);
@@ -60,7 +60,7 @@ export class DebugElementViewListener implements AppViewListener {
6060
}
6161
}
6262

63-
viewDestroyed(view: AppView) {
63+
onViewDestroyed(view: AppView) {
6464
var viewId = _allIdsByView.get(view);
6565
_allIdsByView.delete(view);
6666
_allViewsById.delete(viewId);

‎modules/angular2/src/core/linker/view_listener.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import * as viewModule from './view';
66
*/
77
@Injectable()
88
export class AppViewListener {
9-
viewCreated(view: viewModule.AppView) {}
10-
viewDestroyed(view: viewModule.AppView) {}
9+
onViewCreated(view: viewModule.AppView) {}
10+
onViewDestroyed(view: viewModule.AppView) {}
1111
}

‎modules/angular2/src/core/linker/view_manager.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export class AppViewManager_ extends AppViewManager {
251251
this._renderer.detachFragment(hostView.renderFragment);
252252
this._renderer.dehydrateView(hostView.render);
253253
this._viewDehydrateRecurse(hostView);
254-
this._viewListener.viewDestroyed(hostView);
254+
this._viewListener.onViewDestroyed(hostView);
255255
this._renderer.destroyView(hostView.render);
256256
wtfLeave(s);
257257
}
@@ -390,7 +390,7 @@ export class AppViewManager_ extends AppViewManager {
390390
var mergedParentView =
391391
this._utils.createView(protoView, renderViewWithFragments, this, this._renderer);
392392
this._renderer.setEventDispatcher(mergedParentView.render, mergedParentView);
393-
this._viewListener.viewCreated(mergedParentView);
393+
this._viewListener.onViewCreated(mergedParentView);
394394
return mergedParentView;
395395
}
396396

@@ -409,7 +409,7 @@ export class AppViewManager_ extends AppViewManager {
409409
_destroyPooledView(view: viewModule.AppView) {
410410
var wasReturned = this._viewPool.returnView(view);
411411
if (!wasReturned) {
412-
this._viewListener.viewDestroyed(view);
412+
this._viewListener.onViewDestroyed(view);
413413
this._renderer.destroyView(view.render);
414414
}
415415
}

‎modules/angular2/test/core/linker/view_manager_spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ export function main() {
6262
function wrapView(view: AppView): ViewRef { return new ViewRef_(view); }
6363

6464
function resetSpies() {
65-
viewListener.spy('viewCreated').reset();
66-
viewListener.spy('viewDestroyed').reset();
65+
viewListener.spy('onViewCreated').reset();
66+
viewListener.spy('onViewDestroyed').reset();
6767
renderer.spy('createView').reset();
6868
renderer.spy('destroyView').reset();
6969
renderer.spy('createRootHostView').reset();
@@ -120,7 +120,7 @@ export function main() {
120120
var rootView =
121121
internalView(<ViewRef>manager.createRootHostView(wrapPv(hostProtoView), null, null));
122122
expect(rootView.proto).toBe(hostProtoView);
123-
expect(viewListener.spy('viewCreated')).toHaveBeenCalledWith(rootView);
123+
expect(viewListener.spy('onViewCreated')).toHaveBeenCalledWith(rootView);
124124
});
125125

126126
it('should hydrate the view', () => {
@@ -178,7 +178,7 @@ export function main() {
178178
it('should destroy the render view', () => {
179179
manager.destroyRootHostView(wrapView(hostView));
180180
expect(renderer.spy('destroyView')).toHaveBeenCalledWith(hostRenderViewRef);
181-
expect(viewListener.spy('viewDestroyed')).toHaveBeenCalledWith(hostView);
181+
expect(viewListener.spy('onViewDestroyed')).toHaveBeenCalledWith(hostView);
182182
});
183183

184184
it('should not return the view to the pool', () => {
@@ -223,7 +223,7 @@ export function main() {
223223
internalView(manager.createEmbeddedViewInContainer(vcRef, 0, templateRef));
224224
expect(childView.proto).toBe(childProtoView);
225225
expect(childView).toBe(hostView.views[2]);
226-
expect(viewListener.spy('viewCreated')).not.toHaveBeenCalled();
226+
expect(viewListener.spy('onViewCreated')).not.toHaveBeenCalled();
227227
expect(renderer.spy('createView')).not.toHaveBeenCalled();
228228
});
229229

@@ -264,7 +264,7 @@ export function main() {
264264
internalView(manager.createEmbeddedViewInContainer(vcRef, 1, templateRef));
265265
expect(childView.proto).toBe(childProtoView);
266266
expect(childView).not.toBe(firstChildView);
267-
expect(viewListener.spy('viewCreated')).toHaveBeenCalledWith(childView);
267+
expect(viewListener.spy('onViewCreated')).toHaveBeenCalledWith(childView);
268268
expect(renderer.spy('createView'))
269269
.toHaveBeenCalledWith(childProtoView.render,
270270
childProtoView.mergeInfo.embeddedViewCount + 1);
@@ -309,7 +309,7 @@ export function main() {
309309
internalView(manager.createEmbeddedViewInContainer(vcRef, 0, templateRef));
310310
expect(childView.proto).toBe(childProtoView);
311311
expect(childView).toBe(hostView.views[2]);
312-
expect(viewListener.spy('viewCreated')).not.toHaveBeenCalled();
312+
expect(viewListener.spy('onViewCreated')).not.toHaveBeenCalled();
313313
expect(renderer.spy('createView')).not.toHaveBeenCalled();
314314
});
315315

@@ -329,7 +329,7 @@ export function main() {
329329
<ViewRef>manager.createHostViewInContainer(vcRef, 0, wrapPv(newHostPv), null));
330330
expect(newHostView.proto).toBe(newHostPv);
331331
expect(newHostView).not.toBe(hostView.views[2]);
332-
expect(viewListener.spy('viewCreated')).toHaveBeenCalledWith(newHostView);
332+
expect(viewListener.spy('onViewCreated')).toHaveBeenCalledWith(newHostView);
333333
expect(renderer.spy('createView'))
334334
.toHaveBeenCalledWith(newHostPv.render, newHostPv.mergeInfo.embeddedViewCount + 1);
335335
});

0 commit comments

Comments
 (0)
X Tutup