X Tutup
Skip to content

Commit e11c205

Browse files
vicbvicb
committed
refactor(VmTurnZone): renamed to NgZone
BREAKING CHANGE: VmTurnZone has been renamed to NgZone. - The public API has not chnanged, - The "outer" zone is now named "mount" zone (private to NgZone).
1 parent c75e216 commit e11c205

File tree

11 files changed

+83
-83
lines changed

11 files changed

+83
-83
lines changed

‎modules/angular2/src/core/application.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {TemplateResolver} from './compiler/template_resolver';
1212
import {DirectiveMetadataReader} from './compiler/directive_metadata_reader';
1313
import {List, ListWrapper} from 'angular2/src/facade/collection';
1414
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
15-
import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone';
15+
import {NgZone} from 'angular2/src/core/zone/ng_zone';
1616
import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
1717
import {ShadowDomStrategy} from 'angular2/src/render/dom/shadow_dom/shadow_dom_strategy';
1818
import {EmulatedUnscopedShadowDomStrategy} from 'angular2/src/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy';
@@ -77,10 +77,10 @@ function _injectorBindings(appComponentType): List<Binding> {
7777
bind(appComponentType).toFactory((ref) => ref.instance,
7878
[appComponentRefToken]),
7979
bind(LifeCycle).toFactory((exceptionHandler) => new LifeCycle(exceptionHandler, null, assertionsEnabled()),[ExceptionHandler]),
80-
bind(EventManager).toFactory((zone) => {
80+
bind(EventManager).toFactory((ngZone) => {
8181
var plugins = [new HammerGesturesPlugin(), new KeyEventsPlugin(), new DomEventsPlugin()];
82-
return new EventManager(plugins, zone);
83-
}, [VmTurnZone]),
82+
return new EventManager(plugins, ngZone);
83+
}, [NgZone]),
8484
bind(ShadowDomStrategy).toFactory(
8585
(styleUrlResolver, doc) => new EmulatedUnscopedShadowDomStrategy(styleUrlResolver, doc.head),
8686
[StyleUrlResolver, DOCUMENT_TOKEN]),
@@ -123,7 +123,7 @@ function _injectorBindings(appComponentType): List<Binding> {
123123
];
124124
}
125125

126-
function _createVmZone(givenReporter:Function): VmTurnZone {
126+
function _createNgZone(givenReporter:Function): NgZone {
127127
var defaultErrorReporter = (exception, stackTrace) => {
128128
var longStackTrace = ListWrapper.join(stackTrace, "\n\n-----async gap-----\n");
129129
DOM.logError(`${exception}\n\n${longStackTrace}`);
@@ -132,7 +132,7 @@ function _createVmZone(givenReporter:Function): VmTurnZone {
132132

133133
var reporter = isPresent(givenReporter) ? givenReporter : defaultErrorReporter;
134134

135-
var zone = new VmTurnZone({enableLongStackTrace: assertionsEnabled()});
135+
var zone = new NgZone({enableLongStackTrace: assertionsEnabled()});
136136
zone.initCallbacks({onErrorHandler: reporter});
137137
return zone;
138138
}
@@ -247,7 +247,7 @@ export function bootstrap(appComponentType: Type,
247247
BrowserDomAdapter.makeCurrent();
248248
var bootstrapProcess = PromiseWrapper.completer();
249249

250-
var zone = _createVmZone(errorReporter);
250+
var zone = _createNgZone(errorReporter);
251251
zone.run(() => {
252252
// TODO(rado): prepopulate template cache, so applications with only
253253
// index.html and main.js are possible.
@@ -295,11 +295,11 @@ export class ApplicationRef {
295295
}
296296
}
297297

298-
function _createAppInjector(appComponentType: Type, bindings: List<Binding>, zone: VmTurnZone): Injector {
298+
function _createAppInjector(appComponentType: Type, bindings: List<Binding>, zone: NgZone): Injector {
299299
if (isBlank(_rootInjector)) _rootInjector = Injector.resolveAndCreate(_rootBindings);
300300
var mergedBindings = isPresent(bindings) ?
301301
ListWrapper.concat(_injectorBindings(appComponentType), bindings) :
302302
_injectorBindings(appComponentType);
303-
ListWrapper.push(mergedBindings, bind(VmTurnZone).toValue(zone));
303+
ListWrapper.push(mergedBindings, bind(NgZone).toValue(zone));
304304
return _rootInjector.resolveAndCreateChild(mergedBindings);
305305
}

‎modules/angular2/src/core/life_cycle/life_cycle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Injectable} from 'angular2/src/di/annotations_impl';
22
import {ChangeDetector} from 'angular2/change_detection';
3-
import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone';
3+
import {NgZone} from 'angular2/src/core/zone/ng_zone';
44
import {ExceptionHandler} from 'angular2/src/core/exception_handler';
55
import {isPresent} from 'angular2/src/facade/lang';
66

@@ -46,7 +46,7 @@ export class LifeCycle {
4646
/**
4747
* @private
4848
*/
49-
registerWith(zone:VmTurnZone, changeDetector:ChangeDetector = null) {
49+
registerWith(zone:NgZone, changeDetector:ChangeDetector = null) {
5050
if (isPresent(changeDetector)) {
5151
this._changeDetector=changeDetector;
5252
}

modules/angular2/src/core/zone/vm_turn_zone.cjs renamed to modules/angular2/src/core/zone/ng_zone.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// TODO(vicb): implement this class properly
22
// The current stub implementation is only here to please cjs tests
3-
export class VmTurnZone {
3+
export class NgZone {
44
constructor({enableLongStackTrace}) {
55
}
66

modules/angular2/src/core/zone/vm_turn_zone.dart renamed to modules/angular2/src/core/zone/ng_zone.dart

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ import 'package:stack_trace/stack_trace.dart' show Chain;
1212
*
1313
* A VM turn consist of a single macrotask followed 0 to many microtasks.
1414
*
15-
* The wrapper maintains an "inner" and "outer" `Zone`. The application code will executes
15+
* The wrapper maintains an "inner" and "mount" `Zone`. The application code will executes
1616
* in the "inner" zone unless `runOutsideAngular` is explicitely called.
1717
*
18-
* A typical application will create a singleton `VmTurnZone`. The outer `Zone` is a fork of the root
19-
* `Zone`. The default `onTurnDone` runs the Angular change detection.
18+
* A typical application will create a singleton `NgZone`. The mount zone is the `Zone` where the singleton has been
19+
* instantiated. The default `onTurnDone` runs the Angular change detection.
2020
*/
21-
class VmTurnZone {
21+
class NgZone {
2222
Function _onTurnStart;
2323
Function _onTurnDone;
2424
Function _onErrorHandler;
2525

26-
// Code executed in _outerZone does not trigger the onTurnDone.
27-
Zone _outerZone;
28-
// _innerZone is the child of _outerZone. Any code executed in this zone will trigger the
26+
// Code executed in _mountZone does not trigger the onTurnDone.
27+
Zone _mountZone;
28+
// _innerZone is the child of _mountZone. Any code executed in this zone will trigger the
2929
// onTurnDone hook at the end of the current VM turn.
3030
Zone _innerZone;
3131

@@ -42,14 +42,14 @@ class VmTurnZone {
4242
/**
4343
* Associates with this
4444
*
45-
* - an "outer" [Zone], which is a the one that created this.
46-
* - an "inner" [Zone], which is a child of the outer [Zone].
45+
* - a "mount" [Zone], which is a the one that instantiated this.
46+
* - an "inner" [Zone], which is a child of the mount [Zone].
4747
*
4848
* @param {bool} enableLongStackTrace whether to enable long stack trace. They should only be
4949
* enabled in development mode as they significantly impact perf.
5050
*/
51-
VmTurnZone({bool enableLongStackTrace}) {
52-
_outerZone = Zone.current;
51+
NgZone({bool enableLongStackTrace}) {
52+
_mountZone = Zone.current;
5353

5454
if (enableLongStackTrace) {
5555
_innerZone = Chain.capture(
@@ -68,7 +68,7 @@ class VmTurnZone {
6868
* Initializes the zone hooks.
6969
*
7070
* The given error handler should re-throw the passed exception. Otherwise, exceptions will not
71-
* propagate outside of the [VmTurnZone] and can alter the application execution flow.
71+
* propagate outside of the [NgZone] and can alter the application execution flow.
7272
* Not re-throwing could be used to help testing the code or advanced use cases.
7373
*
7474
* @param {Function} onTurnStart called before code executes in the inner zone for each VM turn
@@ -88,7 +88,7 @@ class VmTurnZone {
8888
* Angular's auto digest mechanism.
8989
*
9090
* ```
91-
* VmTurnZone zone = <ref to the application zone>;
91+
* NgZone zone = <ref to the application zone>;
9292
*
9393
* void functionCalledFromJS() {
9494
* zone.run(() {
@@ -105,13 +105,13 @@ class VmTurnZone {
105105
}
106106

107107
/**
108-
* Runs `fn` in the outer zone and returns whatever it returns.
108+
* Runs `fn` in the mount zone and returns whatever it returns.
109109
*
110110
* In a typical app where the inner zone is the Angular zone, this allows one to escape Angular's
111111
* auto-digest mechanism.
112112
*
113113
* ```
114-
* void myFunction(VmTurnZone zone, Element element) {
114+
* void myFunction(NgZone zone, Element element) {
115115
* element.onClick.listen(() {
116116
* // auto-digest will run after element click.
117117
* });
@@ -124,7 +124,7 @@ class VmTurnZone {
124124
* ```
125125
*/
126126
dynamic runOutsideAngular(fn()) {
127-
return _outerZone.run(fn);
127+
return _mountZone.run(fn);
128128
}
129129

130130
void _maybeStartVmTurn(ZoneDelegate parent) {

modules/angular2/src/core/zone/vm_turn_zone.es6 renamed to modules/angular2/src/core/zone/ng_zone.es6

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@ import {normalizeBlank, isPresent, global} from 'angular2/src/facade/lang';
44
/**
55
* A wrapper around zones that lets you schedule tasks after it has executed a task.
66
*
7-
* The wrapper maintains an "inner" and "outer" `Zone`. The application code will executes
7+
* The wrapper maintains an "inner" and an "mount" `Zone`. The application code will executes
88
* in the "inner" zone unless `runOutsideAngular` is explicitely called.
99
*
10-
* A typical application will create a singleton `VmTurnZone`. The outer `Zone` is a fork of the root
10+
* A typical application will create a singleton `NgZone`. The outer `Zone` is a fork of the root
1111
* `Zone`. The default `onTurnDone` runs the Angular change detection.
1212
*
1313
* @exportedAs angular2/core
1414
*/
15-
export class VmTurnZone {
16-
// Code executed in _outerZone does not trigger the onTurnDone.
17-
_outerZone;
18-
// _innerZone is the child of _outerZone. Any code executed in this zone will trigger the
15+
export class NgZone {
16+
// Code executed in _mountZone does not trigger the onTurnDone.
17+
_mountZone;
18+
// _innerZone is the child of _mountZone. Any code executed in this zone will trigger the
1919
// onTurnDone hook at the end of the current VM turn.
2020
_innerZone;
2121

2222
_onTurnStart:Function;
2323
_onTurnDone:Function;
2424
_onErrorHandler:Function;
2525

26-
// Number of microtasks pending from _outerZone (& descendants)
26+
// Number of microtasks pending from _innerZone (& descendants)
2727
_pendingMicrotask: number;
2828
// Whether some code has been executed in the _innerZone (& descendants) in the current turn
2929
_hasExecutedCodeInInnerZone: boolean;
30-
// run() call depth in _outerZone. 0 at the end of a macrotask
30+
// run() call depth in _mountZone. 0 at the end of a macrotask
3131
// zone.run(() => { // top-level call
3232
// zone.run(() => {}); // nested call -> in-turn
3333
// });
@@ -36,8 +36,8 @@ export class VmTurnZone {
3636
/**
3737
* Associates with this
3838
*
39-
* - an "outer" zone, which is a child of the one that created this.
40-
* - an "inner" zone, which is a child of the outer zone.
39+
* - a "root" zone, which the one that instantiated this.
40+
* - an "inner" zone, which is a child of the root zone.
4141
*
4242
* @param {bool} enableLongStackTrace whether to enable long stack trace. They should only be
4343
* enabled in development mode as they significantly impact perf.
@@ -51,8 +51,8 @@ export class VmTurnZone {
5151
this._hasExecutedCodeInInnerZone = false;
5252
this._nestedRun = 0;
5353

54-
this._outerZone = global.zone;
55-
this._innerZone = this._createInnerZone(this._outerZone, enableLongStackTrace)
54+
this._mountZone = global.zone;
55+
this._innerZone = this._createInnerZone(this._mountZone, enableLongStackTrace)
5656
}
5757

5858
/**
@@ -75,7 +75,7 @@ export class VmTurnZone {
7575
* Angular's auto digest mechanism.
7676
*
7777
* ```
78-
* var zone: VmTurnZone = [ref to the application zone];
78+
* var zone: NgZone = [ref to the application zone];
7979
*
8080
* zone.run(() => {
8181
* // the change detection will run after this function and the microtasks it enqueues have executed.
@@ -93,7 +93,7 @@ export class VmTurnZone {
9393
* auto-digest mechanism.
9494
*
9595
* ```
96-
* var zone: VmTurnZone = [ref to the application zone];
96+
* var zone: NgZone = [ref to the application zone];
9797
*
9898
* zone.runOusideAngular(() => {
9999
* element.onClick(() => {
@@ -103,23 +103,23 @@ export class VmTurnZone {
103103
* ```
104104
*/
105105
runOutsideAngular(fn) {
106-
return this._outerZone.run(fn);
106+
return this._mountZone.run(fn);
107107
}
108108

109109
_createInnerZone(zone, enableLongStackTrace) {
110-
var vmTurnZone = this;
110+
var ngZone = this;
111111
var errorHandling;
112112

113113
if (enableLongStackTrace) {
114114
errorHandling = StringMapWrapper.merge(Zone.longStackTraceZone, {
115115
onError: function (e) {
116-
vmTurnZone._onError(this, e)
116+
ngZone._onError(this, e)
117117
}
118118
});
119119
} else {
120120
errorHandling = {
121121
onError: function (e) {
122-
vmTurnZone._onError(this, e)
122+
ngZone._onError(this, e)
123123
}
124124
};
125125
}
@@ -130,25 +130,25 @@ export class VmTurnZone {
130130
'$run': function(parentRun) {
131131
return function() {
132132
try {
133-
vmTurnZone._nestedRun++;
134-
if (!vmTurnZone._hasExecutedCodeInInnerZone) {
135-
vmTurnZone._hasExecutedCodeInInnerZone = true;
136-
if (vmTurnZone._onTurnStart) {
137-
parentRun.call(vmTurnZone._innerZone, vmTurnZone._onTurnStart);
133+
ngZone._nestedRun++;
134+
if (!ngZone._hasExecutedCodeInInnerZone) {
135+
ngZone._hasExecutedCodeInInnerZone = true;
136+
if (ngZone._onTurnStart) {
137+
parentRun.call(ngZone._innerZone, ngZone._onTurnStart);
138138
}
139139
}
140140
return parentRun.apply(this, arguments);
141141
} finally {
142-
vmTurnZone._nestedRun--;
142+
ngZone._nestedRun--;
143143
// If there are no more pending microtasks, we are at the end of a VM turn (or in onTurnStart)
144144
// _nestedRun will be 0 at the end of a macrotasks (it could be > 0 when there are nested calls
145145
// to run()).
146-
if (vmTurnZone._pendingMicrotasks == 0 && vmTurnZone._nestedRun == 0) {
147-
if (vmTurnZone._onTurnDone && vmTurnZone._hasExecutedCodeInInnerZone) {
146+
if (ngZone._pendingMicrotasks == 0 && ngZone._nestedRun == 0) {
147+
if (ngZone._onTurnDone && ngZone._hasExecutedCodeInInnerZone) {
148148
try {
149-
parentRun.call(vmTurnZone._innerZone, vmTurnZone._onTurnDone);
149+
parentRun.call(ngZone._innerZone, ngZone._onTurnDone);
150150
} finally {
151-
vmTurnZone._hasExecutedCodeInInnerZone = false;
151+
ngZone._hasExecutedCodeInInnerZone = false;
152152
}
153153
}
154154
}
@@ -157,12 +157,12 @@ export class VmTurnZone {
157157
},
158158
'$scheduleMicrotask': function(parentScheduleMicrotask) {
159159
return function(fn) {
160-
vmTurnZone._pendingMicrotasks++;
160+
ngZone._pendingMicrotasks++;
161161
var microtask = function() {
162162
try {
163163
fn();
164164
} finally {
165-
vmTurnZone._pendingMicrotasks--;
165+
ngZone._pendingMicrotasks--;
166166
}
167167
};
168168
parentScheduleMicrotask.call(this, microtask);

modules/angular2/src/mock/vm_turn_zone_mock.js renamed to modules/angular2/src/mock/ng_zone_mock.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone';
1+
import {NgZone} from 'angular2/src/core/zone/ng_zone';
22

3-
export class MockVmTurnZone extends VmTurnZone {
3+
export class MockNgZone extends NgZone {
44
constructor() {
55
super({enableLongStackTrace: false});
66
}
77

88
run(fn) {
9-
fn();
9+
return fn();
1010
}
1111

1212
runOutsideAngular(fn) {

‎modules/angular2/src/render/dom/events/event_manager.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import {isBlank, BaseException, isPresent, StringWrapper} from 'angular2/src/facade/lang';
22
import {DOM} from 'angular2/src/dom/dom_adapter';
33
import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
4-
import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone';
4+
import {NgZone} from 'angular2/src/core/zone/ng_zone';
55

66
var BUBBLE_SYMBOL = '^';
77

88
export class EventManager {
99
_plugins: List<EventManagerPlugin>;
10-
_zone: VmTurnZone;
10+
_zone: NgZone;
1111

12-
constructor(plugins: List<EventManagerPlugin>, zone: VmTurnZone) {
12+
constructor(plugins: List<EventManagerPlugin>, zone: NgZone) {
1313
this._zone = zone;
1414
this._plugins = plugins;
1515
for (var i = 0; i < plugins.length; i++) {
@@ -29,7 +29,7 @@ export class EventManager {
2929
return plugin.addGlobalEventListener(target, withoutBubbleSymbol, handler, withoutBubbleSymbol != eventName);
3030
}
3131

32-
getZone(): VmTurnZone {
32+
getZone(): NgZone {
3333
return this._zone;
3434
}
3535

@@ -93,7 +93,7 @@ export class DomEventsPlugin extends EventManagerPlugin {
9393
});
9494
}
9595

96-
_getOutsideHandler(shouldSupportBubble: boolean, element, handler: Function, zone: VmTurnZone) {
96+
_getOutsideHandler(shouldSupportBubble: boolean, element, handler: Function, zone: NgZone) {
9797
return shouldSupportBubble ?
9898
DomEventsPlugin.bubbleCallback(element, handler, zone) :
9999
DomEventsPlugin.sameElementCallback(element, handler, zone);

0 commit comments

Comments
 (0)
X Tutup