iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(zone): upgrade to zone.js@0.6.21

Browse Source
This commit is contained in:
Misko Hevery 2016-09-10 09:16:03 -07:00 committed by Igor Minar
parent c9513b713a
commit 051a6ebe12
6 changed files with 60 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/core/package.json
View File

@ -9,7 +9,7 @@
"license": "MIT", "license": "MIT",
"peerDependencies": { "peerDependencies": {
"rxjs": "5.0.0-beta.11", "rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.17" "zone.js": "^0.6.21"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

23
modules/@angular/core/src/zone/ng_zone_impl.ts
View File

@ -35,13 +35,16 @@ export class NgZoneImpl {
this.setMacrotask = setMacrotask; this.setMacrotask = setMacrotask;
this.onError = onError; this.onError = onError;
if (Zone) { if (typeof Zone == 'undefined') {
this.outer = this.inner = Zone.current; throw new Error('Angular requires Zone.js prolyfill.');
if ((Zone as any /** TODO #9100 */)['wtfZoneSpec']) {
this.inner = this.inner.fork((Zone as any /** TODO #9100 */)['wtfZoneSpec']);
} }
if (trace && (Zone as any /** TODO #9100 */)['longStackTraceZoneSpec']) { Zone.assertZonePatched();
this.inner = this.inner.fork((Zone as any /** TODO #9100 */)['longStackTraceZoneSpec']); this.outer = this.inner = Zone.current;
if ((Zone as any)['wtfZoneSpec']) {
this.inner = this.inner.fork((Zone as any)['wtfZoneSpec']);
}
if (trace && (Zone as any)['longStackTraceZoneSpec']) {
this.inner = this.inner.fork((Zone as any)['longStackTraceZoneSpec']);
} }
this.inner = this.inner.fork({ this.inner = this.inner.fork({
name: 'angular', name: 'angular',
@ -70,7 +73,7 @@ export class NgZoneImpl {
onHasTask: onHasTask:
(delegate: ZoneDelegate, current: Zone, target: Zone, hasTaskState: HasTaskState) => { (delegate: ZoneDelegate, current: Zone, target: Zone, hasTaskState: HasTaskState) => {
delegate.hasTask(target, hasTaskState); delegate.hasTask(target, hasTaskState);
if (current == target) { if (current === target) {
// We are only interested in hasTask events which originate from our zone // We are only interested in hasTask events which originate from our zone
// (A child hasTask event is not interesting to us) // (A child hasTask event is not interesting to us)
if (hasTaskState.change == 'microTask') { if (hasTaskState.change == 'microTask') {
@ -81,16 +84,12 @@ export class NgZoneImpl {
} }
}, },
onHandleError: (delegate: ZoneDelegate, current: Zone, target: Zone, error: any): onHandleError: (delegate: ZoneDelegate, current: Zone, target: Zone, error: any): boolean => {
boolean => {
delegate.handleError(target, error); delegate.handleError(target, error);
this.onError(error); this.onError(error);
return false; return false;
} }
}); });
} else {
throw new Error('Angular requires Zone.js polyfill.');
}
} }
runInner(fn: () => any): any { return this.inner.run(fn); }; runInner(fn: () => any): any { return this.inner.run(fn); };

2
npm-shrinkwrap.clean.json
View File

@ -4655,7 +4655,7 @@
} }
}, },
"zone.js": { "zone.js": {
"version": "0.6.17" "version": "0.6.21"
} }
}, },
"name": "angular-srcs", "name": "angular-srcs",

5
npm-shrinkwrap.json generated
View File

@ -7421,9 +7421,8 @@
} }
}, },
"zone.js": { "zone.js": {
"version": "0.6.17", "version": "0.6.21",
"from": "zone.js@0.6.17", "from": "zone.js@0.6.21"
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.6.17.tgz"
} }
} }
} }

2
package.json
View File

@ -21,7 +21,7 @@
"core-js": "^2.4.1", "core-js": "^2.4.1",
"reflect-metadata": "^0.1.3", "reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.11", "rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.17" "zone.js": "^0.6.21"
}, },
"devDependencies": { "devDependencies": {
"@types/angularjs": "^1.5.13-alpha", "@types/angularjs": "^1.5.13-alpha",

2
scripts/ci-lite/offline_compiler_test.sh
View File

@ -9,7 +9,7 @@ LINKABLE_PKGS=(
PKGS=( PKGS=(
reflect-metadata@0.1.8 reflect-metadata@0.1.8
typescript@2.0.2 typescript@2.0.2
zone.js@0.6.17 zone.js@0.6.21
rxjs@5.0.0-beta.11 rxjs@5.0.0-beta.11
@types/{node@6.0.38,jasmine@2.2.33} @types/{node@6.0.38,jasmine@2.2.33}
jasmine@2.4.1 jasmine@2.4.1