cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(Completer): rename complete() to resolve()

Browse Source
This commit is contained in:
Victor Berchet 2015-02-25 12:46:50 +01:00
parent 6ad2c18277
commit 41c61e5bc7
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/core/application.js vendored
View File

@ -125,7 +125,7 @@ export function bootstrap(appComponentType: Type, bindings: List<Binding>=null,
lc.registerWith(zone, rootView.changeDetector); lc.registerWith(zone, rootView.changeDetector);
lc.tick(); //the first tick that will bootstrap the app lc.tick(); //the first tick that will bootstrap the app
bootstrapProcess.complete(appInjector); bootstrapProcess.resolve(appInjector);
}, },
(err) => { (err) => {

2
modules/angular2/src/core/compiler/xhr/xhr_impl.es6
View File

@ -11,7 +11,7 @@ export class XHRImpl extends XHR {
xhr.onload = function() { xhr.onload = function() {
var status = xhr.status; var status = xhr.status;
if (200 <= status && status <= 300) { if (200 <= status && status <= 300) {
completer.complete(xhr.responseText); completer.resolve(xhr.responseText);
} else { } else {
completer.reject(`Failed to load ${url}`); completer.reject(`Failed to load ${url}`);
} }

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

@ -33,7 +33,7 @@ class _Completer {
Future get promise => c.future; Future get promise => c.future;
void complete(v) { void resolve(v) {
c.complete(v); c.complete(v);
} }

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

@ -32,7 +32,7 @@ export class PromiseWrapper {
return { return {
promise: p, promise: p,
complete: resolve, resolve: resolve,
reject: reject reject: reject
}; };
} }

2
modules/angular2/src/mock/xhr_mock.js vendored
View File

@ -90,7 +90,7 @@ class _PendingRequest {
if (isBlank(response)) { if (isBlank(response)) {
this.completer.reject(`Failed to load ${this.url}`); this.completer.reject(`Failed to load ${this.url}`);
} else { } else {
this.completer.complete(response); this.completer.resolve(response);
} }
} }

10
modules/angular2/test/core/zone/vm_turn_zone_spec.js vendored
View File

@ -54,8 +54,8 @@ export function main() {
b.promise.then((_) => log.add('b then')); b.promise.then((_) => log.add('b then'));
}); });
a.complete("a"); a.resolve("a");
b.complete("b"); b.resolve("b");
PromiseWrapper.all([a.promise, b.promise]).then((_) => { PromiseWrapper.all([a.promise, b.promise]).then((_) => {
expect(log.result()).toEqual('onTurnStart; run start; onTurnDone; onTurnStart; a then; onTurnDone; onTurnStart; b then; onTurnDone'); expect(log.result()).toEqual('onTurnStart; run start; onTurnDone; onTurnStart; a then; onTurnDone; onTurnStart; b then; onTurnDone');
@ -109,7 +109,7 @@ export function main() {
zone.run(function () { zone.run(function () {
PromiseWrapper.setTimeout(function () { PromiseWrapper.setTimeout(function () {
PromiseWrapper.setTimeout(function () { PromiseWrapper.setTimeout(function () {
c.complete(null); c.resolve(null);
throw new BaseException('ccc'); throw new BaseException('ccc');
}, 0); }, 0);
}, 0); }, 0);
@ -130,7 +130,7 @@ export function main() {
zone.run(function () { zone.run(function () {
PromiseWrapper.resolve(null).then((_) => { PromiseWrapper.resolve(null).then((_) => {
return PromiseWrapper.resolve(null).then((__) => { return PromiseWrapper.resolve(null).then((__) => {
c.complete(null); c.resolve(null);
throw new BaseException("ddd"); throw new BaseException("ddd");
}); });
}); });
@ -152,7 +152,7 @@ export function main() {
zone.run(function () { zone.run(function () {
PromiseWrapper.setTimeout(function () { PromiseWrapper.setTimeout(function () {
PromiseWrapper.setTimeout(function () { PromiseWrapper.setTimeout(function () {
c.complete(null); c.resolve(null);
throw new BaseException('ccc'); throw new BaseException('ccc');
}, 0); }, 0);
}, 0); }, 0);

2
modules/benchpress/src/metric/perflog_metric.js
View File

@ -65,7 +65,7 @@ export class PerflogMetric extends Metric {
} }
var completer = PromiseWrapper.completer(); var completer = PromiseWrapper.completer();
this._setTimeout( this._setTimeout(
() => completer.complete(this._readUntilEndMark(markName, loopCount+1)), () => completer.resolve(this._readUntilEndMark(markName, loopCount+1)),
100 100
); );
return completer.promise; return completer.promise;

2
modules/benchpress/src/webdriver/selenium_webdriver_adapter.es6
View File

@ -21,7 +21,7 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
// selenium-webdriver uses an own Node.js context, // selenium-webdriver uses an own Node.js context,
// so we need to convert data into objects of this context. // so we need to convert data into objects of this context.
// (e.g. otherwise instanceof checks of rtts_assert would fail) // (e.g. otherwise instanceof checks of rtts_assert would fail)
(data) => completer.complete(convertToLocalProcess(data)), (data) => completer.resolve(convertToLocalProcess(data)),
completer.reject completer.reject
); );
return completer.promise; return completer.promise;