X Tutup
Skip to content

Commit 265703b

Browse files
committed
fix(typing): Remove re-export of the Promise built-in type.
Instead, ts2dart can add the 'dart:async' import whenever Promise is used. Fixes #6468
1 parent ae275fa commit 265703b

File tree

80 files changed

+46
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+46
-92
lines changed

modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
2-
import {Promise} from 'angular2/src/facade/async';
32

43
function waitForElement(selector) {
54
var EC = (<any>protractor).ExpectedConditions;

modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
2-
import {Promise} from 'angular2/src/facade/async';
32

43
function waitForElement(selector) {
54
var EC = (<any>protractor).ExpectedConditions;

modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
2-
import {Promise} from 'angular2/src/facade/async';
32

43
function waitForElement(selector) {
54
var EC = (<any>protractor).ExpectedConditions;

modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
2-
import {Promise} from 'angular2/src/facade/async';
32

43
function waitForElement(selector) {
54
var EC = (<any>protractor).ExpectedConditions;

modules/angular2/examples/router/ts/reuse/reuse_spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
2-
import {Promise} from 'angular2/src/facade/async';
32

43
function waitForElement(selector) {
54
var EC = (<any>protractor).ExpectedConditions;

modules/angular2/platform/browser.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export {
1313
} from 'angular2/src/platform/browser_common';
1414

1515
import {Type, isPresent, CONST_EXPR} from 'angular2/src/facade/lang';
16-
import {Promise} from 'angular2/src/facade/promise';
1716
import {
1817
BROWSER_PROVIDERS,
1918
BROWSER_APP_COMMON_PROVIDERS

modules/angular2/platform/browser_static.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export {
1212
} from 'angular2/src/platform/browser_common';
1313

1414
import {Type, isPresent} from 'angular2/src/facade/lang';
15-
import {Promise} from 'angular2/src/facade/promise';
1615
import {
1716
BROWSER_PROVIDERS,
1817
BROWSER_APP_COMMON_PROVIDERS

modules/angular2/src/common/pipes/async_pipe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {isBlank, isPresent, isPromise, CONST} from 'angular2/src/facade/lang';
2-
import {Promise, ObservableWrapper, Observable, EventEmitter} from 'angular2/src/facade/async';
2+
import {ObservableWrapper, Observable, EventEmitter} from 'angular2/src/facade/async';
33
import {
44
Pipe,
55
Injectable,

modules/angular2/src/compiler/runtime_compiler.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {TemplateCompiler} from './template_compiler';
44

55
import {Injectable} from 'angular2/src/core/di';
66
import {Type} from 'angular2/src/facade/lang';
7-
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
87

98
export abstract class RuntimeCompiler extends Compiler {
109
abstract compileInHost(componentType: Type): Promise<HostViewFactoryRef>;

modules/angular2/src/compiler/style_compiler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {SourceModule, SourceExpression, moduleRef} from './source_module';
33
import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
44
import {XHR} from 'angular2/src/compiler/xhr';
55
import {IS_DART, StringWrapper, isBlank} from 'angular2/src/facade/lang';
6-
import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
6+
import {PromiseWrapper} from 'angular2/src/facade/async';
77
import {ShadowCss} from 'angular2/src/compiler/shadow_css';
88
import {UrlResolver} from 'angular2/src/compiler/url_resolver';
99
import {extractStyleUrls} from './style_url_resolver';

0 commit comments

Comments
 (0)
X Tutup