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

build(package): bump rxjs to 5.0.0-beta.2 

Closes #7001
This commit is contained in:
Jeff Cross 2016-02-17 14:05:47 -08:00
parent d736c31fea
commit 46d9c87ddc
5 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/facade/async.ts
View File

@ -6,7 +6,7 @@ import {Subject} from 'rxjs/Subject';
import {Subscription} from 'rxjs/Subscription';
import {Operator} from 'rxjs/Operator';
import {PromiseObservable} from 'rxjs/observable/fromPromise';
import {PromiseObservable} from 'rxjs/observable/PromiseObservable';
import {toPromise} from 'rxjs/operator/toPromise';
export {Observable} from 'rxjs/Observable';

62
modules/angular2/test/core/zone/ng_zone_spec.ts
View File

@ -249,42 +249,42 @@ function commonTests() {
}, resultTimer);
}), testTimeout);
it('should run subscriber listeners in the subscription zone (outside)',
inject([AsyncTestCompleter], (async) => {
// Each subscriber fires a microtask outside the Angular zone. The test
// then verifies that those microtasks do not cause additional digests.
xit('should run subscriber listeners in the subscription zone (outside)',
inject([AsyncTestCompleter], (async) => {
// Each subscriber fires a microtask outside the Angular zone. The test
// then verifies that those microtasks do not cause additional digests.
var turnStart = false;
ObservableWrapper.subscribe(_zone.onTurnStart, (_) => {
if (turnStart) throw 'Should not call this more than once';
_log.add('onTurnStart');
microTask(() => {});
turnStart = true;
});
var turnStart = false;
ObservableWrapper.subscribe(_zone.onTurnStart, (_) => {
if (turnStart) throw 'Should not call this more than once';
_log.add('onTurnStart');
microTask(() => {});
turnStart = true;
});
var turnDone = false;
ObservableWrapper.subscribe(_zone.onTurnDone, (_) => {
if (turnDone) throw 'Should not call this more than once';
_log.add('onTurnDone');
microTask(() => {});
turnDone = true;
});
var turnDone = false;
ObservableWrapper.subscribe(_zone.onTurnDone, (_) => {
if (turnDone) throw 'Should not call this more than once';
_log.add('onTurnDone');
microTask(() => {});
turnDone = true;
});
var eventDone = false;
ObservableWrapper.subscribe(_zone.onEventDone, (_) => {
if (eventDone) throw 'Should not call this more than once';
_log.add('onEventDone');
microTask(() => {});
eventDone = true;
});
var eventDone = false;
ObservableWrapper.subscribe(_zone.onEventDone, (_) => {
if (eventDone) throw 'Should not call this more than once';
_log.add('onEventDone');
microTask(() => {});
eventDone = true;
});
macroTask(() => { _zone.run(_log.fn('run')); });
macroTask(() => { _zone.run(_log.fn('run')); });
macroTask(() => {
expect(_log.result()).toEqual('onTurnStart; run; onTurnDone; onEventDone');
async.done();
}, resultTimer);
}), testTimeout);
macroTask(() => {
expect(_log.result()).toEqual('onTurnStart; run; onTurnDone; onEventDone');
async.done();
}, resultTimer);
}), testTimeout);
it('should run subscriber listeners in the subscription zone (inside)',
inject([AsyncTestCompleter], (async) => {

2
npm-shrinkwrap.clean.json
View File

@ -4820,7 +4820,7 @@
"version": "1.1.5"
},
"rxjs": {
"version": "5.0.0-beta.0"
"version": "5.0.0-beta.2"
},
"sass-graph": {
"version": "2.0.1",

10
npm-shrinkwrap.json generated
View File

@ -7684,9 +7684,9 @@
"resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.1.5.tgz"
},
"rxjs": {
"version": "5.0.0-beta.0",
"from": "rxjs@5.0.0-beta.0",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.0.tgz"
"version": "5.0.0-beta.2",
"from": "rxjs@5.0.0-beta.2",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.2.tgz"
},
"sass-graph": {
"version": "2.0.1",
@ -7823,7 +7823,8 @@
"dependencies": {
"mime-db": {
"version": "1.20.0",
"from": "mime-db@>=1.20.0 <1.21.0"
"from": "mime-db@1.20.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"
},
"mime-types": {
"version": "2.1.8",
@ -8537,6 +8538,7 @@
"ts2dart": {
"version": "0.7.24",
"from": "ts2dart@0.7.24",
"resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.24.tgz",
"dependencies": {
"source-map": {
"version": "0.4.4",

2
package.json
View File

@ -35,7 +35,7 @@
"es6-promise": "^3.0.2",
"es6-shim": "^0.33.3",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.0",
"rxjs": "5.0.0-beta.2",
"zone.js": "0.5.14"
},
"devDependencies": {