diff --git a/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts b/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts index 3f5728bb7a..58b8e8cc57 100644 --- a/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts +++ b/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts index b92fd26332..a83e76c207 100644 --- a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts +++ b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts b/modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts index d6e57e6fba..e6eac4056f 100644 --- a/modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts +++ b/modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts index 5f48717d0c..f063b6c01a 100644 --- a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts +++ b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/examples/router/ts/reuse/reuse_spec.ts b/modules/angular2/examples/router/ts/reuse/reuse_spec.ts index e1f2454722..7bf638490e 100644 --- a/modules/angular2/examples/router/ts/reuse/reuse_spec.ts +++ b/modules/angular2/examples/router/ts/reuse/reuse_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/angular2/platform/browser.ts b/modules/angular2/platform/browser.ts index 711a194ec1..50ee08bfc0 100644 --- a/modules/angular2/platform/browser.ts +++ b/modules/angular2/platform/browser.ts @@ -13,7 +13,6 @@ export { } from 'angular2/src/platform/browser_common'; import {Type, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; -import {Promise} from 'angular2/src/facade/promise'; import { BROWSER_PROVIDERS, BROWSER_APP_COMMON_PROVIDERS diff --git a/modules/angular2/platform/browser_static.ts b/modules/angular2/platform/browser_static.ts index 6722212af1..928a31639d 100644 --- a/modules/angular2/platform/browser_static.ts +++ b/modules/angular2/platform/browser_static.ts @@ -12,7 +12,6 @@ export { } from 'angular2/src/platform/browser_common'; import {Type, isPresent} from 'angular2/src/facade/lang'; -import {Promise} from 'angular2/src/facade/promise'; import { BROWSER_PROVIDERS, BROWSER_APP_COMMON_PROVIDERS diff --git a/modules/angular2/src/common/pipes/async_pipe.ts b/modules/angular2/src/common/pipes/async_pipe.ts index 31496e9ec4..34654df5a7 100644 --- a/modules/angular2/src/common/pipes/async_pipe.ts +++ b/modules/angular2/src/common/pipes/async_pipe.ts @@ -1,5 +1,5 @@ import {isBlank, isPresent, isPromise, CONST} from 'angular2/src/facade/lang'; -import {Promise, ObservableWrapper, Observable, EventEmitter} from 'angular2/src/facade/async'; +import {ObservableWrapper, Observable, EventEmitter} from 'angular2/src/facade/async'; import { Pipe, Injectable, diff --git a/modules/angular2/src/compiler/runtime_compiler.ts b/modules/angular2/src/compiler/runtime_compiler.ts index 07ac2990a3..68800146bd 100644 --- a/modules/angular2/src/compiler/runtime_compiler.ts +++ b/modules/angular2/src/compiler/runtime_compiler.ts @@ -4,7 +4,6 @@ import {TemplateCompiler} from './template_compiler'; import {Injectable} from 'angular2/src/core/di'; import {Type} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; export abstract class RuntimeCompiler extends Compiler { abstract compileInHost(componentType: Type): Promise; diff --git a/modules/angular2/src/compiler/style_compiler.ts b/modules/angular2/src/compiler/style_compiler.ts index 8cc5437214..0d69cad2e0 100644 --- a/modules/angular2/src/compiler/style_compiler.ts +++ b/modules/angular2/src/compiler/style_compiler.ts @@ -3,7 +3,7 @@ import {SourceModule, SourceExpression, moduleRef} from './source_module'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; import {XHR} from 'angular2/src/compiler/xhr'; import {IS_DART, StringWrapper, isBlank} from 'angular2/src/facade/lang'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {ShadowCss} from 'angular2/src/compiler/shadow_css'; import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {extractStyleUrls} from './style_url_resolver'; diff --git a/modules/angular2/src/compiler/template_compiler.ts b/modules/angular2/src/compiler/template_compiler.ts index 04a33eadbd..29a7cf5e64 100644 --- a/modules/angular2/src/compiler/template_compiler.ts +++ b/modules/angular2/src/compiler/template_compiler.ts @@ -14,7 +14,7 @@ import { MapWrapper, StringMapWrapper } from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import { createHostComponentMeta, CompileDirectiveMetadata, diff --git a/modules/angular2/src/compiler/template_normalizer.ts b/modules/angular2/src/compiler/template_normalizer.ts index 06f26a2690..6e4c1bf049 100644 --- a/modules/angular2/src/compiler/template_normalizer.ts +++ b/modules/angular2/src/compiler/template_normalizer.ts @@ -5,7 +5,7 @@ import { } from './directive_metadata'; import {isPresent, isBlank} from 'angular2/src/facade/lang'; import {BaseException} from 'angular2/src/facade/exceptions'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {XHR} from 'angular2/src/compiler/xhr'; import {UrlResolver} from 'angular2/src/compiler/url_resolver'; diff --git a/modules/angular2/src/compiler/xhr.ts b/modules/angular2/src/compiler/xhr.ts index 6eb5d6a604..f9b9e20e94 100644 --- a/modules/angular2/src/compiler/xhr.ts +++ b/modules/angular2/src/compiler/xhr.ts @@ -1,5 +1,3 @@ -import {Promise} from 'angular2/src/facade/async'; - // TODO: vsavkin rename it into TemplateLoader /** * An interface for retrieving documents by URL that the compiler uses diff --git a/modules/angular2/src/compiler/xhr_mock.ts b/modules/angular2/src/compiler/xhr_mock.ts index 44f715fb0d..e3ba3b454e 100644 --- a/modules/angular2/src/compiler/xhr_mock.ts +++ b/modules/angular2/src/compiler/xhr_mock.ts @@ -2,7 +2,7 @@ import {XHR} from 'angular2/src/compiler/xhr'; import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; import {isBlank, isPresent, normalizeBlank} from 'angular2/src/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; -import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseCompleter, PromiseWrapper} from 'angular2/src/facade/async'; /** * A mock implementation of {@link XHR} that allows outgoing requests to be mocked diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts index a37815eac6..d6e8006a36 100644 --- a/modules/angular2/src/core/application_ref.ts +++ b/modules/angular2/src/core/application_ref.ts @@ -15,12 +15,7 @@ import { PLATFORM_INITIALIZER, APP_INITIALIZER } from './application_tokens'; -import { - Promise, - PromiseWrapper, - PromiseCompleter, - ObservableWrapper -} from 'angular2/src/facade/async'; +import {PromiseWrapper, PromiseCompleter, ObservableWrapper} from 'angular2/src/facade/async'; import {ListWrapper} from 'angular2/src/facade/collection'; import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability'; import { diff --git a/modules/angular2/src/core/linker/compiler.ts b/modules/angular2/src/core/linker/compiler.ts index 9447952ffd..6eefc88836 100644 --- a/modules/angular2/src/core/linker/compiler.ts +++ b/modules/angular2/src/core/linker/compiler.ts @@ -3,7 +3,7 @@ import {HostViewFactoryRef} from 'angular2/src/core/linker/view_ref'; import {Injectable} from 'angular2/src/core/di'; import {Type, isBlank, stringify} from 'angular2/src/facade/lang'; import {BaseException} from 'angular2/src/facade/exceptions'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {HostViewFactory} from 'angular2/src/core/linker/view'; import {HostViewFactoryRef_} from 'angular2/src/core/linker/view_ref'; diff --git a/modules/angular2/src/core/linker/dynamic_component_loader.ts b/modules/angular2/src/core/linker/dynamic_component_loader.ts index e885ab892f..a005f6c894 100644 --- a/modules/angular2/src/core/linker/dynamic_component_loader.ts +++ b/modules/angular2/src/core/linker/dynamic_component_loader.ts @@ -1,7 +1,6 @@ import {Key, Injector, ResolvedProvider, Provider, provide, Injectable} from 'angular2/src/core/di'; import {Compiler} from './compiler'; import {isType, Type, stringify, isPresent} from 'angular2/src/facade/lang'; -import {Promise} from 'angular2/src/facade/async'; import {AppViewManager} from 'angular2/src/core/linker/view_manager'; import {ElementRef, ElementRef_} from './element_ref'; import {HostViewRef} from './view_ref'; diff --git a/modules/angular2/src/facade/async.ts b/modules/angular2/src/facade/async.ts index ababf8a355..e089a742ec 100644 --- a/modules/angular2/src/facade/async.ts +++ b/modules/angular2/src/facade/async.ts @@ -1,8 +1,5 @@ import {global, isPresent, noop} from 'angular2/src/facade/lang'; -// We make sure promises are in a separate file so that we can use promises -// without depending on rxjs. -import {Promise} from 'angular2/src/facade/promise'; -export {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/facade/promise'; +export {PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/promise'; import {Observable} from 'rxjs/Observable'; import {Subject} from 'rxjs/Subject'; diff --git a/modules/angular2/src/facade/promise.dart b/modules/angular2/src/facade/promise.dart index 0970f37eb6..783ccddc0f 100644 --- a/modules/angular2/src/facade/promise.dart +++ b/modules/angular2/src/facade/promise.dart @@ -2,7 +2,6 @@ library angular2.core.facade.promise; import 'dart:async'; import 'dart:async' as async; -export 'dart:async' show Future; class PromiseWrapper { static Future resolve(obj) => new Future.value(obj); diff --git a/modules/angular2/src/facade/promise.ts b/modules/angular2/src/facade/promise.ts index eaeff6d351..6e077fa5e0 100644 --- a/modules/angular2/src/facade/promise.ts +++ b/modules/angular2/src/facade/promise.ts @@ -1,6 +1,3 @@ -// Promises are put into their own facade file so that they can be used without -// introducing a dependency on rxjs. They are re-exported through facade/async. -export {Promise}; export interface PromiseCompleter { promise: Promise; diff --git a/modules/angular2/src/mock/mock_application_ref.ts b/modules/angular2/src/mock/mock_application_ref.ts index 77062f0f68..748953aa2c 100644 --- a/modules/angular2/src/mock/mock_application_ref.ts +++ b/modules/angular2/src/mock/mock_application_ref.ts @@ -4,7 +4,6 @@ import {Type} from 'angular2/src/facade/lang'; import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; import {Provider, Injector} from 'angular2/src/core/di'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {Promise} from 'angular2/src/facade/async'; /** * A no-op implementation of {@link ApplicationRef}, useful for testing. diff --git a/modules/angular2/src/platform/browser/ruler.ts b/modules/angular2/src/platform/browser/ruler.ts index deeed1cdcb..78b19e5f49 100644 --- a/modules/angular2/src/platform/browser/ruler.ts +++ b/modules/angular2/src/platform/browser/ruler.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {DomAdapter} from 'angular2/src/platform/dom/dom_adapter'; import {ElementRef} from 'angular2/src/core/linker/element_ref'; diff --git a/modules/angular2/src/platform/browser/xhr_impl.ts b/modules/angular2/src/platform/browser/xhr_impl.ts index c54d4c76f1..69729ec1bf 100644 --- a/modules/angular2/src/platform/browser/xhr_impl.ts +++ b/modules/angular2/src/platform/browser/xhr_impl.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/promise'; +import {PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/promise'; import {isPresent} from 'angular2/src/facade/lang'; import {XHR} from 'angular2/src/compiler/xhr'; diff --git a/modules/angular2/src/router/async_route_handler.ts b/modules/angular2/src/router/async_route_handler.ts index a739352151..62ea9b5b12 100644 --- a/modules/angular2/src/router/async_route_handler.ts +++ b/modules/angular2/src/router/async_route_handler.ts @@ -1,4 +1,3 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {isPresent, Type} from 'angular2/src/facade/lang'; import {RouteHandler} from './route_handler'; diff --git a/modules/angular2/src/router/component_recognizer.ts b/modules/angular2/src/router/component_recognizer.ts index 616680673c..7d204c2184 100644 --- a/modules/angular2/src/router/component_recognizer.ts +++ b/modules/angular2/src/router/component_recognizer.ts @@ -1,7 +1,7 @@ import {isBlank, isPresent} from 'angular2/src/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {Map, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import { AbstractRecognizer, diff --git a/modules/angular2/src/router/instruction.ts b/modules/angular2/src/router/instruction.ts index 29c6ab7aca..fe36a34eb1 100644 --- a/modules/angular2/src/router/instruction.ts +++ b/modules/angular2/src/router/instruction.ts @@ -1,6 +1,6 @@ import {Map, MapWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {isPresent, isBlank, normalizeBlank, Type, CONST_EXPR} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; /** diff --git a/modules/angular2/src/router/lifecycle_annotations.ts b/modules/angular2/src/router/lifecycle_annotations.ts index 840f1d2fc5..895b027271 100644 --- a/modules/angular2/src/router/lifecycle_annotations.ts +++ b/modules/angular2/src/router/lifecycle_annotations.ts @@ -5,7 +5,6 @@ import {makeDecorator} from 'angular2/src/core/util/decorators'; import {CanActivate as CanActivateAnnotation} from './lifecycle_annotations_impl'; -import {Promise} from 'angular2/src/facade/async'; import {ComponentInstruction} from './instruction'; export { diff --git a/modules/angular2/src/router/route_handler.ts b/modules/angular2/src/router/route_handler.ts index 5971267ee8..cb5f510378 100644 --- a/modules/angular2/src/router/route_handler.ts +++ b/modules/angular2/src/router/route_handler.ts @@ -1,4 +1,3 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {Type} from 'angular2/src/facade/lang'; import {RouteData} from './instruction'; diff --git a/modules/angular2/src/router/route_recognizer.ts b/modules/angular2/src/router/route_recognizer.ts index 7f44fffa86..266d12b8b3 100644 --- a/modules/angular2/src/router/route_recognizer.ts +++ b/modules/angular2/src/router/route_recognizer.ts @@ -1,6 +1,6 @@ import {isPresent, isBlank} from 'angular2/src/facade/lang'; import {BaseException} from 'angular2/src/facade/exceptions'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/promise'; +import {PromiseWrapper} from 'angular2/src/facade/promise'; import {Map} from 'angular2/src/facade/collection'; import {RouteHandler} from './route_handler'; diff --git a/modules/angular2/src/router/route_registry.ts b/modules/angular2/src/router/route_registry.ts index 5750396c29..b441f02a84 100644 --- a/modules/angular2/src/router/route_registry.ts +++ b/modules/angular2/src/router/route_registry.ts @@ -1,5 +1,5 @@ import {ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import { isPresent, isArray, diff --git a/modules/angular2/src/router/router.ts b/modules/angular2/src/router/router.ts index d0f2ce3d16..305c4b750d 100644 --- a/modules/angular2/src/router/router.ts +++ b/modules/angular2/src/router/router.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {Map, StringMapWrapper, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {isBlank, isString, isPresent, Type, isArray} from 'angular2/src/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; diff --git a/modules/angular2/src/router/router_outlet.ts b/modules/angular2/src/router/router_outlet.ts index e7e47ac0c8..4abd36cffa 100644 --- a/modules/angular2/src/router/router_outlet.ts +++ b/modules/angular2/src/router/router_outlet.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {StringMapWrapper} from 'angular2/src/facade/collection'; import {isBlank, isPresent} from 'angular2/src/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; diff --git a/modules/angular2/src/router/sync_route_handler.ts b/modules/angular2/src/router/sync_route_handler.ts index 1b951a098a..c9c90fefd0 100644 --- a/modules/angular2/src/router/sync_route_handler.ts +++ b/modules/angular2/src/router/sync_route_handler.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {isPresent, Type} from 'angular2/src/facade/lang'; import {RouteHandler} from './route_handler'; diff --git a/modules/angular2/src/testing/test_component_builder.ts b/modules/angular2/src/testing/test_component_builder.ts index bf8d265eaa..1f68e57c3a 100644 --- a/modules/angular2/src/testing/test_component_builder.ts +++ b/modules/angular2/src/testing/test_component_builder.ts @@ -12,7 +12,6 @@ import { } from 'angular2/core'; import {Type, isPresent, isBlank} from 'angular2/src/facade/lang'; -import {Promise} from 'angular2/src/facade/async'; import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; import {ViewRef_} from 'angular2/src/core/linker/view_ref'; diff --git a/modules/angular2/src/web_workers/shared/client_message_broker.ts b/modules/angular2/src/web_workers/shared/client_message_broker.ts index 6188d29cf3..2b4e68fe05 100644 --- a/modules/angular2/src/web_workers/shared/client_message_broker.ts +++ b/modules/angular2/src/web_workers/shared/client_message_broker.ts @@ -1,7 +1,6 @@ import {MessageBus} from "angular2/src/web_workers/shared/message_bus"; import {print, isPresent, DateWrapper, stringify} from "angular2/src/facade/lang"; import { - Promise, PromiseCompleter, PromiseWrapper, ObservableWrapper, diff --git a/modules/angular2/src/web_workers/shared/service_message_broker.ts b/modules/angular2/src/web_workers/shared/service_message_broker.ts index 16b8501abc..eb67be1d1c 100644 --- a/modules/angular2/src/web_workers/shared/service_message_broker.ts +++ b/modules/angular2/src/web_workers/shared/service_message_broker.ts @@ -3,7 +3,7 @@ import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; import {Serializer} from "angular2/src/web_workers/shared/serializer"; import {isPresent, Type, FunctionWrapper} from "angular2/src/facade/lang"; import {MessageBus} from "angular2/src/web_workers/shared/message_bus"; -import {EventEmitter, Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; +import {EventEmitter, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; export abstract class ServiceMessageBrokerFactory { /** diff --git a/modules/angular2/src/web_workers/ui/platform_location.ts b/modules/angular2/src/web_workers/ui/platform_location.ts index 21ceccd112..5bd3f6e594 100644 --- a/modules/angular2/src/web_workers/ui/platform_location.ts +++ b/modules/angular2/src/web_workers/ui/platform_location.ts @@ -9,7 +9,7 @@ import {PRIMITIVE, Serializer} from 'angular2/src/web_workers/shared/serializer' import {bind} from './bind'; import {LocationType} from 'angular2/src/web_workers/shared/serialized_types'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; -import {Promise, EventEmitter, ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async'; +import {EventEmitter, ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async'; import {UrlChangeListener} from 'angular2/src/router/platform_location'; @Injectable() diff --git a/modules/angular2/src/web_workers/worker/platform_location.ts b/modules/angular2/src/web_workers/worker/platform_location.ts index 6ada0ffc10..a4d5a0a3c3 100644 --- a/modules/angular2/src/web_workers/worker/platform_location.ts +++ b/modules/angular2/src/web_workers/worker/platform_location.ts @@ -12,7 +12,7 @@ import { } from 'angular2/src/web_workers/shared/client_message_broker'; import {ROUTER_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {LocationType} from 'angular2/src/web_workers/shared/serialized_types'; -import {Promise, PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {BaseException} from 'angular2/src/facade/exceptions'; import {PRIMITIVE, Serializer} from 'angular2/src/web_workers/shared/serializer'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; diff --git a/modules/angular2/src/web_workers/worker/router_providers.ts b/modules/angular2/src/web_workers/worker/router_providers.ts index c3cce5ea2e..193103fca8 100644 --- a/modules/angular2/src/web_workers/worker/router_providers.ts +++ b/modules/angular2/src/web_workers/worker/router_providers.ts @@ -2,7 +2,6 @@ import {ApplicationRef, Provider, NgZone, APP_INITIALIZER} from 'angular2/core'; import {PlatformLocation} from 'angular2/src/router/platform_location'; import {WebWorkerPlatformLocation} from './platform_location'; import {ROUTER_PROVIDERS_COMMON} from 'angular2/src/router/router_providers_common'; -import {Promise} from 'angular2/src/facade/async'; export var WORKER_APP_ROUTER = [ ROUTER_PROVIDERS_COMMON, diff --git a/modules/angular2/src/web_workers/worker/xhr_impl.ts b/modules/angular2/src/web_workers/worker/xhr_impl.ts index 077654807c..5b25ecfe76 100644 --- a/modules/angular2/src/web_workers/worker/xhr_impl.ts +++ b/modules/angular2/src/web_workers/worker/xhr_impl.ts @@ -1,5 +1,4 @@ import {Injectable} from 'angular2/src/core/di'; -import {Promise} from 'angular2/src/facade/async'; import {XHR} from 'angular2/src/compiler/xhr'; import { FnArg, diff --git a/modules/angular2/test/compiler/change_detector_compiler_spec.ts b/modules/angular2/test/compiler/change_detector_compiler_spec.ts index 876c13170a..b9630f6a50 100644 --- a/modules/angular2/test/compiler/change_detector_compiler_spec.ts +++ b/modules/angular2/test/compiler/change_detector_compiler_spec.ts @@ -16,7 +16,6 @@ import {provide} from 'angular2/src/core/di'; import {CONST_EXPR, stringify, IS_DART} from 'angular2/src/facade/lang'; import {MapWrapper} from 'angular2/src/facade/collection'; -import {Promise} from 'angular2/src/facade/async'; import {ChangeDetectionCompiler} from 'angular2/src/compiler/change_detector_compiler'; diff --git a/modules/angular2/test/compiler/eval_module.ts b/modules/angular2/test/compiler/eval_module.ts index 497bccbe64..29d0cecc59 100644 --- a/modules/angular2/test/compiler/eval_module.ts +++ b/modules/angular2/test/compiler/eval_module.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {isPresent, global, StringWrapper} from 'angular2/src/facade/lang'; var evalCounter = 0; diff --git a/modules/angular2/test/compiler/style_compiler_spec.ts b/modules/angular2/test/compiler/style_compiler_spec.ts index 4074d612ee..349f2c90ae 100644 --- a/modules/angular2/test/compiler/style_compiler_spec.ts +++ b/modules/angular2/test/compiler/style_compiler_spec.ts @@ -25,7 +25,7 @@ import { isArray, IS_DART } from 'angular2/src/facade/lang'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {evalModule} from './eval_module'; import {StyleCompiler} from 'angular2/src/compiler/style_compiler'; import { diff --git a/modules/angular2/test/compiler/template_compiler_spec.ts b/modules/angular2/test/compiler/template_compiler_spec.ts index fce620019e..95ceda9f91 100644 --- a/modules/angular2/test/compiler/template_compiler_spec.ts +++ b/modules/angular2/test/compiler/template_compiler_spec.ts @@ -13,7 +13,7 @@ import { beforeEachProviders } from 'angular2/testing_internal'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {Type, isPresent, isBlank, stringify, isString, IS_DART} from 'angular2/src/facade/lang'; import { MapWrapper, diff --git a/modules/angular2/test/compiler/xhr_mock_spec.ts b/modules/angular2/test/compiler/xhr_mock_spec.ts index 44a797f78c..64f45a3b4a 100644 --- a/modules/angular2/test/compiler/xhr_mock_spec.ts +++ b/modules/angular2/test/compiler/xhr_mock_spec.ts @@ -10,7 +10,7 @@ import { it, } from 'angular2/testing_internal'; import {MockXHR} from 'angular2/src/compiler/xhr_mock'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {isPresent} from 'angular2/src/facade/lang'; export function main() { diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/angular2/test/core/linker/integration_spec.ts index 6eca60cb15..eb00f4b5dd 100644 --- a/modules/angular2/test/core/linker/integration_spec.ts +++ b/modules/angular2/test/core/linker/integration_spec.ts @@ -40,7 +40,6 @@ import { EventEmitter, ObservableWrapper, PromiseCompleter, - Promise } from 'angular2/src/facade/async'; import { diff --git a/modules/angular2/test/facade/async_dart_spec.dart b/modules/angular2/test/facade/async_dart_spec.dart index 6b6728db98..bcf5a1c2a7 100644 --- a/modules/angular2/test/facade/async_dart_spec.dart +++ b/modules/angular2/test/facade/async_dart_spec.dart @@ -1,6 +1,7 @@ /// This file contains tests that make sense only in Dart library angular2.test.facade.async_dart_spec; +import 'dart:async'; import 'package:angular2/testing_internal.dart'; import 'package:angular2/src/facade/async.dart'; diff --git a/modules/angular2/test/router/component_recognizer_spec.ts b/modules/angular2/test/router/component_recognizer_spec.ts index 5924bf5b73..7e083d0302 100644 --- a/modules/angular2/test/router/component_recognizer_spec.ts +++ b/modules/angular2/test/router/component_recognizer_spec.ts @@ -17,7 +17,7 @@ import {ComponentRecognizer} from 'angular2/src/router/component_recognizer'; import {Route, Redirect} from 'angular2/src/router/route_config_decorator'; import {parser} from 'angular2/src/router/url_parser'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/promise'; +import {PromiseWrapper} from 'angular2/src/facade/promise'; export function main() { diff --git a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts index 207ff02289..a644314d85 100644 --- a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts +++ b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts @@ -18,7 +18,6 @@ import { import {provide, Component, Injector, Inject, View} from 'angular2/core'; import {isPresent} from 'angular2/src/facade/lang'; import { - Promise, PromiseWrapper, PromiseCompleter, EventEmitter, diff --git a/modules/angular2/test/router/integration/navigation_spec.ts b/modules/angular2/test/router/integration/navigation_spec.ts index 78c07cfb7d..959f4794e5 100644 --- a/modules/angular2/test/router/integration/navigation_spec.ts +++ b/modules/angular2/test/router/integration/navigation_spec.ts @@ -16,7 +16,7 @@ import { } from 'angular2/testing_internal'; import {provide, Component, View, Injector, Inject} from 'angular2/core'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {Router, RouterOutlet, RouterLink, RouteParams, RouteData, Location} from 'angular2/router'; import { diff --git a/modules/angular2/test/router/route_registry_spec.ts b/modules/angular2/test/router/route_registry_spec.ts index 972c78cdfb..76385dbb73 100644 --- a/modules/angular2/test/router/route_registry_spec.ts +++ b/modules/angular2/test/router/route_registry_spec.ts @@ -10,7 +10,7 @@ import { SpyObject } from 'angular2/testing_internal'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {Type, IS_DART} from 'angular2/src/facade/lang'; import {RouteRegistry} from 'angular2/src/router/route_registry'; diff --git a/modules/angular2/test/router/router_spec.ts b/modules/angular2/test/router/router_spec.ts index 96b61eac2e..ada2a30b73 100644 --- a/modules/angular2/test/router/router_spec.ts +++ b/modules/angular2/test/router/router_spec.ts @@ -12,7 +12,7 @@ import { } from 'angular2/testing_internal'; import {SpyRouterOutlet} from './spies'; import {Type} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; import {ListWrapper} from 'angular2/src/facade/collection'; import {Router, RootRouter} from 'angular2/src/router/router'; diff --git a/modules/angular2_material/src/components/dialog/dialog.ts b/modules/angular2_material/src/components/dialog/dialog.ts index 3f92b36bc7..4d4a241ebf 100644 --- a/modules/angular2_material/src/components/dialog/dialog.ts +++ b/modules/angular2_material/src/components/dialog/dialog.ts @@ -16,7 +16,7 @@ import { ViewEncapsulation } from 'angular2/core'; -import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async'; import {isPresent, Type} from 'angular2/src/facade/lang'; import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {MouseEvent, KeyboardEvent} from 'angular2/src/facade/browser'; diff --git a/modules/benchpress/src/metric.ts b/modules/benchpress/src/metric.ts index 6c8233b16b..5fb6e2b5ae 100644 --- a/modules/benchpress/src/metric.ts +++ b/modules/benchpress/src/metric.ts @@ -1,5 +1,4 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; /** diff --git a/modules/benchpress/src/metric/multi_metric.ts b/modules/benchpress/src/metric/multi_metric.ts index c82c7109e4..384f48249a 100644 --- a/modules/benchpress/src/metric/multi_metric.ts +++ b/modules/benchpress/src/metric/multi_metric.ts @@ -1,6 +1,6 @@ import {bind, provide, Binding, Provider, Injector, OpaqueToken} from 'angular2/src/core/di'; import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {Metric} from '../metric'; diff --git a/modules/benchpress/src/metric/perflog_metric.ts b/modules/benchpress/src/metric/perflog_metric.ts index 2b3b7ed171..9ba4895d65 100644 --- a/modules/benchpress/src/metric/perflog_metric.ts +++ b/modules/benchpress/src/metric/perflog_metric.ts @@ -1,4 +1,4 @@ -import {PromiseWrapper, Promise, TimerWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper, TimerWrapper} from 'angular2/src/facade/async'; import { isPresent, isBlank, diff --git a/modules/benchpress/src/reporter.ts b/modules/benchpress/src/reporter.ts index 498ceb5dfb..bbf7deb539 100644 --- a/modules/benchpress/src/reporter.ts +++ b/modules/benchpress/src/reporter.ts @@ -1,5 +1,4 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {MeasureValues} from './measure_values'; diff --git a/modules/benchpress/src/reporter/console_reporter.ts b/modules/benchpress/src/reporter/console_reporter.ts index dd1076c44c..0f92fdd762 100644 --- a/modules/benchpress/src/reporter/console_reporter.ts +++ b/modules/benchpress/src/reporter/console_reporter.ts @@ -1,6 +1,6 @@ import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/facade/lang'; import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {Math} from 'angular2/src/facade/math'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; diff --git a/modules/benchpress/src/reporter/json_file_reporter.ts b/modules/benchpress/src/reporter/json_file_reporter.ts index 32ec9a6286..736123397a 100644 --- a/modules/benchpress/src/reporter/json_file_reporter.ts +++ b/modules/benchpress/src/reporter/json_file_reporter.ts @@ -1,5 +1,5 @@ import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; diff --git a/modules/benchpress/src/reporter/multi_reporter.ts b/modules/benchpress/src/reporter/multi_reporter.ts index 6117d3d81f..d365820fae 100644 --- a/modules/benchpress/src/reporter/multi_reporter.ts +++ b/modules/benchpress/src/reporter/multi_reporter.ts @@ -1,5 +1,5 @@ import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {MeasureValues} from '../measure_values'; import {Reporter} from '../reporter'; diff --git a/modules/benchpress/src/runner.ts b/modules/benchpress/src/runner.ts index 27180058d6..ff0daabd75 100644 --- a/modules/benchpress/src/runner.ts +++ b/modules/benchpress/src/runner.ts @@ -1,6 +1,6 @@ import {Injector, bind, provide, Provider} from 'angular2/src/core/di'; import {isPresent, isBlank} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {Sampler, SampleState} from './sampler'; import {ConsoleReporter} from './reporter/console_reporter'; diff --git a/modules/benchpress/src/sampler.ts b/modules/benchpress/src/sampler.ts index 9953676add..7742be351d 100644 --- a/modules/benchpress/src/sampler.ts +++ b/modules/benchpress/src/sampler.ts @@ -1,5 +1,5 @@ import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di'; import {Metric} from './metric'; diff --git a/modules/benchpress/src/web_driver_adapter.ts b/modules/benchpress/src/web_driver_adapter.ts index 2bed818336..7ca775e499 100644 --- a/modules/benchpress/src/web_driver_adapter.ts +++ b/modules/benchpress/src/web_driver_adapter.ts @@ -1,5 +1,4 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; -import {Promise} from 'angular2/src/facade/async'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {Map} from 'angular2/src/facade/collection'; diff --git a/modules/benchpress/src/web_driver_extension.ts b/modules/benchpress/src/web_driver_extension.ts index 9e339ee965..53b9ba3927 100644 --- a/modules/benchpress/src/web_driver_extension.ts +++ b/modules/benchpress/src/web_driver_extension.ts @@ -2,7 +2,6 @@ import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/ import {isBlank, isPresent} from 'angular2/src/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {Options} from './common_options'; diff --git a/modules/benchpress/src/webdriver/async_webdriver_adapter.dart b/modules/benchpress/src/webdriver/async_webdriver_adapter.dart index 6826930d08..cc17815522 100644 --- a/modules/benchpress/src/webdriver/async_webdriver_adapter.dart +++ b/modules/benchpress/src/webdriver/async_webdriver_adapter.dart @@ -1,7 +1,7 @@ library benchpress.src.webdriver.async_webdriver_adapter_dart; +import 'dart:async'; import 'package:webdriver/webdriver.dart' show WebDriver, LogEntry; -import 'package:angular2/src/facade/async.dart' show Future; import '../web_driver_adapter.dart' show WebDriverAdapter; class AsyncWebDriverAdapter extends WebDriverAdapter { diff --git a/modules/benchpress/src/webdriver/chrome_driver_extension.ts b/modules/benchpress/src/webdriver/chrome_driver_extension.ts index 9086a82fca..b91c1d39e9 100644 --- a/modules/benchpress/src/webdriver/chrome_driver_extension.ts +++ b/modules/benchpress/src/webdriver/chrome_driver_extension.ts @@ -12,7 +12,6 @@ import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/facade/async'; import {Options} from '../common_options'; /** diff --git a/modules/benchpress/src/webdriver/firefox_driver_extension.ts b/modules/benchpress/src/webdriver/firefox_driver_extension.ts index 1100976add..203fc5ef70 100644 --- a/modules/benchpress/src/webdriver/firefox_driver_extension.ts +++ b/modules/benchpress/src/webdriver/firefox_driver_extension.ts @@ -2,7 +2,6 @@ import {bind, provide, Provider} from 'angular2/src/core/di'; import {isPresent, StringWrapper} from 'angular2/src/facade/lang'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/facade/async'; export class FirefoxDriverExtension extends WebDriverExtension { static get BINDINGS(): Provider[] { return _PROVIDERS; } diff --git a/modules/benchpress/src/webdriver/ios_driver_extension.ts b/modules/benchpress/src/webdriver/ios_driver_extension.ts index 160f9d9f77..f423e4442d 100644 --- a/modules/benchpress/src/webdriver/ios_driver_extension.ts +++ b/modules/benchpress/src/webdriver/ios_driver_extension.ts @@ -4,7 +4,6 @@ import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/facade/async'; export class IOsDriverExtension extends WebDriverExtension { // TODO(tbosch): use static values when our transpiler supports them diff --git a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts index 667915af02..afe20a4c73 100644 --- a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts +++ b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {bind, provide, Provider} from 'angular2/src/core/di'; import {WebDriverAdapter} from '../web_driver_adapter'; @@ -21,9 +21,8 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter { (data) => completer.resolve(convertToLocalProcess(data)), completer.reject); return completer.promise; } - b - waitFor(callback): Promise { + waitFor(callback): Promise { return this._convertPromise(this._driver.controlFlow().execute(callback)); } diff --git a/modules/benchpress/test/metric/multi_metric_spec.ts b/modules/benchpress/test/metric/multi_metric_spec.ts index 7165ff60db..f68ff23bbc 100644 --- a/modules/benchpress/test/metric/multi_metric_spec.ts +++ b/modules/benchpress/test/metric/multi_metric_spec.ts @@ -12,7 +12,7 @@ import { } from 'angular2/testing_internal'; import {ListWrapper} from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {Metric, MultiMetric, bind, provide, Injector} from 'benchpress/common'; diff --git a/modules/benchpress/test/metric/perflog_metric_spec.ts b/modules/benchpress/test/metric/perflog_metric_spec.ts index e77f5d781c..6e8419ca4f 100644 --- a/modules/benchpress/test/metric/perflog_metric_spec.ts +++ b/modules/benchpress/test/metric/perflog_metric_spec.ts @@ -12,7 +12,7 @@ import { } from 'angular2/testing_internal'; import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {isPresent, isBlank} from 'angular2/src/facade/lang'; import { diff --git a/modules/benchpress/test/reporter/multi_reporter_spec.ts b/modules/benchpress/test/reporter/multi_reporter_spec.ts index e5fa8c12cd..6d4dfe3ff4 100644 --- a/modules/benchpress/test/reporter/multi_reporter_spec.ts +++ b/modules/benchpress/test/reporter/multi_reporter_spec.ts @@ -11,7 +11,7 @@ import { xit, } from 'angular2/testing_internal'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import {DateWrapper} from 'angular2/src/facade/lang'; import {Reporter, MultiReporter, bind, provide, Injector, MeasureValues} from 'benchpress/common'; diff --git a/modules/benchpress/test/runner_spec.ts b/modules/benchpress/test/runner_spec.ts index fef2549118..fe7af2ee20 100644 --- a/modules/benchpress/test/runner_spec.ts +++ b/modules/benchpress/test/runner_spec.ts @@ -24,7 +24,7 @@ import { SampleState } from 'benchpress/common'; import {isBlank} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; export function main() { describe('runner', () => { diff --git a/modules/benchpress/test/sampler_spec.ts b/modules/benchpress/test/sampler_spec.ts index 1a49059ef5..cbdfe675af 100644 --- a/modules/benchpress/test/sampler_spec.ts +++ b/modules/benchpress/test/sampler_spec.ts @@ -12,7 +12,7 @@ import { } from 'angular2/testing_internal'; import {isBlank, isPresent, stringify, Date, DateWrapper} from 'angular2/src/facade/lang'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/facade/async'; import { Sampler, diff --git a/modules/playground/e2e_test/hash_routing/hash_location_spec.ts b/modules/playground/e2e_test/hash_routing/hash_location_spec.ts index 856e367f67..d495deae84 100644 --- a/modules/playground/e2e_test/hash_routing/hash_location_spec.ts +++ b/modules/playground/e2e_test/hash_routing/hash_location_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/relative_assets/assets_spec.ts b/modules/playground/e2e_test/relative_assets/assets_spec.ts index 69e815807d..7f1e32106c 100644 --- a/modules/playground/e2e_test/relative_assets/assets_spec.ts +++ b/modules/playground/e2e_test/relative_assets/assets_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/routing/routing_spec.ts b/modules/playground/e2e_test/routing/routing_spec.ts index cd303f144a..670d7f8947 100644 --- a/modules/playground/e2e_test/routing/routing_spec.ts +++ b/modules/playground/e2e_test/routing/routing_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts index cb02933df7..084caa36d1 100644 --- a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts +++ b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; describe('WebWorkers Kitchen Sink', function() { afterEach(() => { diff --git a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts index 3e9fe5370f..b587954eda 100644 --- a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts +++ b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts @@ -1,5 +1,4 @@ import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; describe('WebWorkers Todo', function() { afterEach(() => { diff --git a/modules/playground/src/routing/inbox-app.ts b/modules/playground/src/routing/inbox-app.ts index 0205785c05..1ec5576e81 100644 --- a/modules/playground/src/routing/inbox-app.ts +++ b/modules/playground/src/routing/inbox-app.ts @@ -9,7 +9,7 @@ import { RouteParams } from 'angular2/router'; import * as db from './data'; -import {ObservableWrapper, PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async'; import {ListWrapper} from 'angular2/src/facade/collection'; import {isPresent, DateWrapper} from 'angular2/src/facade/lang';