diff --git a/modules/angular2/angular2.dart b/modules/angular2/angular2.dart index e66bfc81b7..469828e2d6 100644 --- a/modules/angular2/angular2.dart +++ b/modules/angular2/angular2.dart @@ -13,4 +13,5 @@ export 'package:angular2/lifecycle_hooks.dart'; export 'package:angular2/src/core/application_tokens.dart' hide APP_COMPONENT_REF_PROMISE, APP_ID_RANDOM_PROVIDER; export 'package:angular2/src/platform/dom/dom_tokens.dart'; +export 'package:angular2/src/platform/dom/dom_adapter.dart'; export 'package:angular2/compiler.dart' show UrlResolver, AppRootUrl; \ No newline at end of file diff --git a/modules/angular2/angular2.ts b/modules/angular2/angular2.ts index 8a7c831161..94ceafaa51 100644 --- a/modules/angular2/angular2.ts +++ b/modules/angular2/angular2.ts @@ -3,5 +3,6 @@ export * from './core'; export * from './profile'; export * from './lifecycle_hooks'; export * from './platform/browser'; +export * from './src/platform/dom/dom_adapter'; export * from './upgrade'; export {UrlResolver, AppRootUrl} from './compiler'; diff --git a/modules/angular2/core.ts b/modules/angular2/core.ts index 50c3e48f27..8f75db928f 100644 --- a/modules/angular2/core.ts +++ b/modules/angular2/core.ts @@ -29,5 +29,4 @@ export * from './src/core/change_detection'; export * from './src/core/platform_directives_and_pipes'; export * from './src/core/platform_common_providers'; export * from './src/core/application_common_providers'; -export * from './src/core/reflection/reflection'; -export * from './src/core/dom/dom_adapter'; +export * from './src/core/reflection/reflection'; \ No newline at end of file diff --git a/modules/angular2/platform/common_dom.ts b/modules/angular2/platform/common_dom.ts index 92a18bef8e..507f35ebf0 100644 --- a/modules/angular2/platform/common_dom.ts +++ b/modules/angular2/platform/common_dom.ts @@ -1,6 +1,7 @@ /** * This is a set of classes and objects that can be used both in the browser and on the server. */ +export {DOM, setRootDomAdapter, DomAdapter} from 'angular2/src/platform/dom/dom_adapter'; export {DomRenderer} from 'angular2/src/platform/dom/dom_renderer'; export {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens'; export {SharedStylesHost, DomSharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host'; diff --git a/modules/angular2/src/animate/animation.ts b/modules/angular2/src/animate/animation.ts index 1ed6a2242d..4e73758989 100644 --- a/modules/angular2/src/animate/animation.ts +++ b/modules/angular2/src/animate/animation.ts @@ -8,7 +8,7 @@ import { import {Math} from 'angular2/src/facade/math'; import {camelCaseToDashCase} from 'angular2/src/platform/dom/util'; import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {BrowserDetails} from './browser_details'; import {CssAnimationOptions} from './css_animation_options'; diff --git a/modules/angular2/src/animate/browser_details.ts b/modules/angular2/src/animate/browser_details.ts index 3af818f2f7..8c0316321f 100644 --- a/modules/angular2/src/animate/browser_details.ts +++ b/modules/angular2/src/animate/browser_details.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/src/core/di'; import {Math} from 'angular2/src/facade/math'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; @Injectable() export class BrowserDetails { diff --git a/modules/angular2/src/compiler/anchor_based_app_root_url.ts b/modules/angular2/src/compiler/anchor_based_app_root_url.ts index 8e9e4963a1..7e59c0b553 100644 --- a/modules/angular2/src/compiler/anchor_based_app_root_url.ts +++ b/modules/angular2/src/compiler/anchor_based_app_root_url.ts @@ -1,5 +1,5 @@ import {AppRootUrl} from "angular2/src/compiler/app_root_url"; -import {DOM} from "angular2/src/core/dom/dom_adapter"; +import {DOM} from "angular2/src/platform/dom/dom_adapter"; import {Injectable} from "angular2/src/core/di"; /** diff --git a/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts b/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts index f2c3d48720..86d825022d 100644 --- a/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts +++ b/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts @@ -1,7 +1,7 @@ import {Injectable} from 'angular2/src/core/di'; import {isPresent, isBlank} from 'angular2/src/facade/lang'; import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {ElementSchemaRegistry} from './element_schema_registry'; diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts index 1d37ec26d5..5d2d6c9ba4 100644 --- a/modules/angular2/src/core/application_ref.ts +++ b/modules/angular2/src/core/application_ref.ts @@ -1,5 +1,5 @@ import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {Type, isBlank, isPresent, assertionsEnabled} from 'angular2/src/facade/lang'; +import {Type, isBlank, isPresent, assertionsEnabled, print} from 'angular2/src/facade/lang'; import {provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di'; import { APP_COMPONENT_REF_PROMISE, @@ -26,7 +26,6 @@ import { ExceptionHandler, unimplemented } from 'angular2/src/facade/exceptions'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {internalView} from 'angular2/src/core/linker/view_ref'; import {wtfLeave, wtfCreateScope, WtfScopeFn} from './profile/profile'; import {ChangeDetectorRef} from 'angular2/src/core/change_detection/change_detector_ref'; @@ -248,7 +247,7 @@ export class PlatformRef_ extends PlatformRef { if (isPresent(exceptionHandler)) { exceptionHandler.call(e, e.stack); } else { - DOM.logError(e); + print(e.toString()); } } }); diff --git a/modules/angular2/src/core/dom/dom_adapter.dart b/modules/angular2/src/core/dom/dom_adapter.dart new file mode 100644 index 0000000000..aae5d5b169 --- /dev/null +++ b/modules/angular2/src/core/dom/dom_adapter.dart @@ -0,0 +1,4 @@ +@Deprecated('import this from "package:angular2/platform/common_dom.dart"') +library angular2.dom_adapter_reexport; + +export 'package:angular2/src/platform/dom/dom_adapter.dart'; \ No newline at end of file diff --git a/modules/angular2/src/platform/browser/browser_adapter.dart b/modules/angular2/src/platform/browser/browser_adapter.dart index ce98e774b1..4c8c55c73f 100644 --- a/modules/angular2/src/platform/browser/browser_adapter.dart +++ b/modules/angular2/src/platform/browser/browser_adapter.dart @@ -1,7 +1,7 @@ library angular.core.facade.dom; import 'dart:html'; -import 'package:angular2/core.dart' show setRootDomAdapter; +import 'package:angular2/platform/common_dom.dart' show setRootDomAdapter; import 'generic_browser_adapter.dart' show GenericBrowserDomAdapter; import 'package:angular2/src/facade/browser.dart'; import 'dart:js' as js; diff --git a/modules/angular2/src/platform/browser/browser_adapter.ts b/modules/angular2/src/platform/browser/browser_adapter.ts index 79af0e6a60..d79afde928 100644 --- a/modules/angular2/src/platform/browser/browser_adapter.ts +++ b/modules/angular2/src/platform/browser/browser_adapter.ts @@ -1,6 +1,6 @@ import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {isBlank, isPresent, global, setValueOnPath, DateWrapper} from 'angular2/src/facade/lang'; -import {setRootDomAdapter} from 'angular2/src/core/dom/dom_adapter'; +import {setRootDomAdapter} from 'angular2/src/platform/dom/dom_adapter'; import {GenericBrowserDomAdapter} from './generic_browser_adapter'; var _attrToPropMap = { diff --git a/modules/angular2/src/platform/browser/debug/by.ts b/modules/angular2/src/platform/browser/debug/by.ts index 8b16c8324e..9daa684f42 100644 --- a/modules/angular2/src/platform/browser/debug/by.ts +++ b/modules/angular2/src/platform/browser/debug/by.ts @@ -1,6 +1,6 @@ import {Type, isPresent, isBlank} from 'angular2/src/facade/lang'; import {Predicate} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {DebugElement} from 'angular2/core'; export class By { diff --git a/modules/angular2/src/platform/browser/debug/debug_element_view_listener.ts b/modules/angular2/src/platform/browser/debug/debug_element_view_listener.ts index 1094e75389..bcf5670883 100644 --- a/modules/angular2/src/platform/browser/debug/debug_element_view_listener.ts +++ b/modules/angular2/src/platform/browser/debug/debug_element_view_listener.ts @@ -3,7 +3,7 @@ import {MapWrapper, Map, ListWrapper} from 'angular2/src/facade/collection'; import {Injectable, provide, Provider} from 'angular2/src/core/di'; import {AppViewListener} from 'angular2/src/core/linker/view_listener'; import {AppView} from 'angular2/src/core/linker/view'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Renderer} from 'angular2/src/core/render/api'; import {DebugElement, DebugElement_} from 'angular2/src/core/debug/debug_element'; diff --git a/modules/angular2/src/platform/browser/generic_browser_adapter.ts b/modules/angular2/src/platform/browser/generic_browser_adapter.ts index aa8f880341..a04ed83f9e 100644 --- a/modules/angular2/src/platform/browser/generic_browser_adapter.ts +++ b/modules/angular2/src/platform/browser/generic_browser_adapter.ts @@ -1,6 +1,6 @@ import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {isPresent, isFunction, Type} from 'angular2/src/facade/lang'; -import {DomAdapter} from 'angular2/src/core/dom/dom_adapter'; +import {DomAdapter} from 'angular2/src/platform/dom/dom_adapter'; import {XHRImpl} from 'angular2/src/platform/browser/xhr_impl'; diff --git a/modules/angular2/src/platform/browser/ruler.ts b/modules/angular2/src/platform/browser/ruler.ts index 379298d16f..deeed1cdcb 100644 --- a/modules/angular2/src/platform/browser/ruler.ts +++ b/modules/angular2/src/platform/browser/ruler.ts @@ -1,5 +1,5 @@ import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {DomAdapter} from 'angular2/src/core/dom/dom_adapter'; +import {DomAdapter} from 'angular2/src/platform/dom/dom_adapter'; import {ElementRef} from 'angular2/src/core/linker/element_ref'; export class Rectangle { diff --git a/modules/angular2/src/platform/browser/testability.dart b/modules/angular2/src/platform/browser/testability.dart index c3683403da..8dbccb26d5 100644 --- a/modules/angular2/src/platform/browser/testability.dart +++ b/modules/angular2/src/platform/browser/testability.dart @@ -1,6 +1,7 @@ library testability.browser_testability; import 'package:angular2/core.dart'; +import 'package:angular2/platform/common_dom.dart'; import 'dart:html'; import 'dart:js' as js; diff --git a/modules/angular2/src/platform/browser/testability.ts b/modules/angular2/src/platform/browser/testability.ts index 6c87ee8f69..bb35c488e6 100644 --- a/modules/angular2/src/platform/browser/testability.ts +++ b/modules/angular2/src/platform/browser/testability.ts @@ -3,7 +3,7 @@ import {CONST, CONST_EXPR, global, isPresent} from 'angular2/src/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/facade/exceptions'; import {PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import { Injectable, diff --git a/modules/angular2/src/platform/browser/title.ts b/modules/angular2/src/platform/browser/title.ts index d7367aaac5..3a925ba4b5 100644 --- a/modules/angular2/src/platform/browser/title.ts +++ b/modules/angular2/src/platform/browser/title.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; /** * A service that can be used to get and set the title of a current HTML document. diff --git a/modules/angular2/src/platform/browser_common.ts b/modules/angular2/src/platform/browser_common.ts index 8cf88c55f2..7a8919e6d9 100644 --- a/modules/angular2/src/platform/browser_common.ts +++ b/modules/angular2/src/platform/browser_common.ts @@ -17,8 +17,7 @@ import { import {COMMON_DIRECTIVES, COMMON_PIPES, FORM_PROVIDERS} from "angular2/common"; import {Renderer} from 'angular2/render'; import {Testability} from 'angular2/src/core/testability/testability'; - -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events'; import {KeyEventsPlugin} from 'angular2/src/platform/dom/events/key_events'; import {HammerGesturesPlugin} from 'angular2/src/platform/dom/events/hammer_gestures'; diff --git a/modules/angular2/src/core/dom/dom_adapter.ts b/modules/angular2/src/platform/dom/dom_adapter.ts similarity index 100% rename from modules/angular2/src/core/dom/dom_adapter.ts rename to modules/angular2/src/platform/dom/dom_adapter.ts diff --git a/modules/angular2/src/platform/dom/dom_renderer.ts b/modules/angular2/src/platform/dom/dom_renderer.ts index ffa57f486b..cf2a74e6a8 100644 --- a/modules/angular2/src/platform/dom/dom_renderer.ts +++ b/modules/angular2/src/platform/dom/dom_renderer.ts @@ -42,7 +42,7 @@ import {camelCaseToDashCase} from './util'; import {ViewEncapsulation} from 'angular2/src/core/metadata'; // TODO move it once DomAdapter is moved -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; const NAMESPACE_URIS = CONST_EXPR({'xlink': 'http://www.w3.org/1999/xlink', 'svg': 'http://www.w3.org/2000/svg'}); diff --git a/modules/angular2/src/platform/dom/events/dom_events.ts b/modules/angular2/src/platform/dom/events/dom_events.ts index cb06c62e38..1121efa78e 100644 --- a/modules/angular2/src/platform/dom/events/dom_events.ts +++ b/modules/angular2/src/platform/dom/events/dom_events.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Injectable, EventManagerPlugin, EventManager} from 'angular2/core'; @Injectable() diff --git a/modules/angular2/src/platform/dom/events/key_events.ts b/modules/angular2/src/platform/dom/events/key_events.ts index 46217b70df..cc969c2b7b 100644 --- a/modules/angular2/src/platform/dom/events/key_events.ts +++ b/modules/angular2/src/platform/dom/events/key_events.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import { isPresent, isBlank, diff --git a/modules/angular2/src/platform/dom/shared_styles_host.ts b/modules/angular2/src/platform/dom/shared_styles_host.ts index 290bfd3a36..f96401af5b 100644 --- a/modules/angular2/src/platform/dom/shared_styles_host.ts +++ b/modules/angular2/src/platform/dom/shared_styles_host.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Inject, Injectable} from 'angular2/src/core/di'; import {SetWrapper} from 'angular2/src/facade/collection'; import {DOCUMENT} from './dom_tokens'; diff --git a/modules/angular2/src/platform/server/abstract_html_adapter.dart b/modules/angular2/src/platform/server/abstract_html_adapter.dart index d4b4665b28..d845769b96 100644 --- a/modules/angular2/src/platform/server/abstract_html_adapter.dart +++ b/modules/angular2/src/platform/server/abstract_html_adapter.dart @@ -3,7 +3,7 @@ library angular2.dom.abstractHtmlAdapter; import 'package:html/parser.dart' as parser; import 'package:html/dom.dart'; -import 'package:angular2/core.dart'; +import 'package:angular2/platform/common_dom.dart'; import 'package:angular2/src/compiler/xhr.dart'; const _attrToPropMap = const { diff --git a/modules/angular2/src/platform/server/html_adapter.dart b/modules/angular2/src/platform/server/html_adapter.dart index 6ed42fe206..3e00cea312 100644 --- a/modules/angular2/src/platform/server/html_adapter.dart +++ b/modules/angular2/src/platform/server/html_adapter.dart @@ -1,7 +1,7 @@ library angular2.dom.htmlAdapter; import 'abstract_html_adapter.dart'; -import 'package:angular2/core.dart' show setRootDomAdapter; +import 'package:angular2/platform/common_dom.dart'; import 'dart:io'; class Html5LibDomAdapter extends AbstractHtml5LibAdapter { diff --git a/modules/angular2/src/platform/server/parse5_adapter.ts b/modules/angular2/src/platform/server/parse5_adapter.ts index f038ecd0cf..5fd9f1a390 100644 --- a/modules/angular2/src/platform/server/parse5_adapter.ts +++ b/modules/angular2/src/platform/server/parse5_adapter.ts @@ -4,7 +4,7 @@ var serializer = new parse5.Serializer(parse5.TreeAdapters.htmlparser2); var treeAdapter = parser.treeAdapter; import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {DomAdapter, setRootDomAdapter} from 'angular2/core'; +import {DomAdapter, setRootDomAdapter} from 'angular2/platform/common_dom'; import { isPresent, isBlank, diff --git a/modules/angular2/src/platform/server/webworker_adapter.dart b/modules/angular2/src/platform/server/webworker_adapter.dart index 4a48ea72b9..b8f0960e64 100644 --- a/modules/angular2/src/platform/server/webworker_adapter.dart +++ b/modules/angular2/src/platform/server/webworker_adapter.dart @@ -1,7 +1,7 @@ library angular2.dom.webWorkerAdapter; import 'abstract_html_adapter.dart'; -import 'package:angular2/core.dart' show setRootDomAdapter; +import 'package:angular2/platform/common_dom.dart'; class WebWorkerDomAdapter extends AbstractHtml5LibAdapter { static void makeCurrent() { diff --git a/modules/angular2/src/router/hash_location_strategy.ts b/modules/angular2/src/router/hash_location_strategy.ts index e54b6f31ab..614053c279 100644 --- a/modules/angular2/src/router/hash_location_strategy.ts +++ b/modules/angular2/src/router/hash_location_strategy.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Injectable} from 'angular2/angular2'; import {LocationStrategy, normalizeQueryParams} from './location_strategy'; import {EventListener, History, Location} from 'angular2/src/facade/browser'; diff --git a/modules/angular2/src/router/path_location_strategy.ts b/modules/angular2/src/router/path_location_strategy.ts index 4504058353..56eebe029a 100644 --- a/modules/angular2/src/router/path_location_strategy.ts +++ b/modules/angular2/src/router/path_location_strategy.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Injectable, Inject} from 'angular2/angular2'; import {EventListener, History, Location} from 'angular2/src/facade/browser'; import {isBlank} from 'angular2/src/facade/lang'; diff --git a/modules/angular2/src/testing/matchers.dart b/modules/angular2/src/testing/matchers.dart index 91fc39d708..f24aab61cc 100644 --- a/modules/angular2/src/testing/matchers.dart +++ b/modules/angular2/src/testing/matchers.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'package:guinness/guinness.dart' as gns; -import 'package:angular2/src/core/dom/dom_adapter.dart' show DOM; +import 'package:angular2/src/platform/dom/dom_adapter.dart' show DOM; Expect expect(actual, [matcher]) { final expect = new Expect(actual); diff --git a/modules/angular2/src/testing/matchers.ts b/modules/angular2/src/testing/matchers.ts index fe2f84d704..a44a218493 100644 --- a/modules/angular2/src/testing/matchers.ts +++ b/modules/angular2/src/testing/matchers.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {global} from 'angular2/src/facade/lang'; diff --git a/modules/angular2/src/testing/test_component_builder.ts b/modules/angular2/src/testing/test_component_builder.ts index 3fe5d62bcc..89a42be321 100644 --- a/modules/angular2/src/testing/test_component_builder.ts +++ b/modules/angular2/src/testing/test_component_builder.ts @@ -18,7 +18,7 @@ import { import {el} from './utils'; import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {DebugElement, DebugElement_} from 'angular2/src/core/debug/debug_element'; diff --git a/modules/angular2/src/testing/test_injector.ts b/modules/angular2/src/testing/test_injector.ts index 9c97b6f9d1..1ac4b66987 100644 --- a/modules/angular2/src/testing/test_injector.ts +++ b/modules/angular2/src/testing/test_injector.ts @@ -19,7 +19,7 @@ import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component import {XHR} from 'angular2/src/compiler/xhr'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {EventManager, EVENT_MANAGER_PLUGINS} from 'angular2/core'; import {MockDirectiveResolver} from 'angular2/src/mock/directive_resolver_mock'; diff --git a/modules/angular2/src/testing/testing_internal.ts b/modules/angular2/src/testing/testing_internal.ts index 9323715dc8..befc3731b9 100644 --- a/modules/angular2/src/testing/testing_internal.ts +++ b/modules/angular2/src/testing/testing_internal.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {StringMapWrapper} from 'angular2/src/facade/collection'; import {global, isFunction, Math} from 'angular2/src/facade/lang'; import {NgZoneZone} from 'angular2/src/core/zone/ng_zone'; diff --git a/modules/angular2/src/testing/utils.ts b/modules/angular2/src/testing/utils.ts index 26cc665bb7..4783ae959f 100644 --- a/modules/angular2/src/testing/utils.ts +++ b/modules/angular2/src/testing/utils.ts @@ -1,5 +1,5 @@ import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {isPresent, isString, RegExpWrapper, StringWrapper, RegExp} from 'angular2/src/facade/lang'; export class Log { diff --git a/modules/angular2/src/tools/common_tools.ts b/modules/angular2/src/tools/common_tools.ts index f57f8fe093..cbeb9dd2fc 100644 --- a/modules/angular2/src/tools/common_tools.ts +++ b/modules/angular2/src/tools/common_tools.ts @@ -2,7 +2,7 @@ import {ApplicationRef} from 'angular2/src/core/application_ref'; import {ComponentRef, ComponentRef_} from 'angular2/src/core/linker/dynamic_component_loader'; import {isPresent, NumberWrapper} from 'angular2/src/facade/lang'; import {performance, window} from 'angular2/src/facade/browser'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; /** * Entry point for all Angular debug tools. This object corresponds to the `ng` diff --git a/modules/angular2/src/web_workers/ui/di_bindings.ts b/modules/angular2/src/web_workers/ui/di_bindings.ts index 42aa128fbe..2ec3120fe8 100644 --- a/modules/angular2/src/web_workers/ui/di_bindings.ts +++ b/modules/angular2/src/web_workers/ui/di_bindings.ts @@ -20,7 +20,7 @@ import {APP_ID_RANDOM_PROVIDER} from 'angular2/src/core/application_tokens'; import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry'; import {DomElementSchemaRegistry} from 'angular2/src/compiler/schema/dom_element_schema_registry'; import {SharedStylesHost, DomSharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {AppViewManager, AppViewManager_} from 'angular2/src/core/linker/view_manager'; import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils'; diff --git a/modules/angular2/test/animate/animation_builder_spec.ts b/modules/angular2/test/animate/animation_builder_spec.ts index 7c1f3c3d78..ce95349236 100644 --- a/modules/angular2/test/animate/animation_builder_spec.ts +++ b/modules/angular2/test/animate/animation_builder_spec.ts @@ -1,6 +1,6 @@ import {el, describe, it, iit, expect, inject, SpyObject} from 'angular2/testing_internal'; import {AnimationBuilder} from 'angular2/src/animate/animation_builder'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; export function main() { describe("AnimationBuilder", () => { diff --git a/modules/angular2/test/common/directives/ng_if_spec.ts b/modules/angular2/test/common/directives/ng_if_spec.ts index 1b4939557f..033a612ffa 100644 --- a/modules/angular2/test/common/directives/ng_if_spec.ts +++ b/modules/angular2/test/common/directives/ng_if_spec.ts @@ -12,7 +12,7 @@ import { xit, } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Component, View} from 'angular2/core'; import {NgIf} from 'angular2/common'; diff --git a/modules/angular2/test/common/directives/ng_style_spec.ts b/modules/angular2/test/common/directives/ng_style_spec.ts index 1bcf1dd6d2..34fe7a1166 100644 --- a/modules/angular2/test/common/directives/ng_style_spec.ts +++ b/modules/angular2/test/common/directives/ng_style_spec.ts @@ -18,7 +18,7 @@ import {StringMapWrapper} from 'angular2/src/facade/collection'; import {Component, View} from 'angular2/angular2'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {NgStyle} from 'angular2/src/common/directives/ng_style'; export function main() { diff --git a/modules/angular2/test/common/directives/non_bindable_spec.ts b/modules/angular2/test/common/directives/non_bindable_spec.ts index b2102b3ebd..13297c604f 100644 --- a/modules/angular2/test/common/directives/non_bindable_spec.ts +++ b/modules/angular2/test/common/directives/non_bindable_spec.ts @@ -11,7 +11,7 @@ import { it, xit, } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Component, Directive, View} from 'angular2/core'; import {ElementRef} from 'angular2/src/core/linker/element_ref'; diff --git a/modules/angular2/test/common/forms/integration_spec.ts b/modules/angular2/test/common/forms/integration_spec.ts index d0751eec43..7bf858dc08 100644 --- a/modules/angular2/test/common/forms/integration_spec.ts +++ b/modules/angular2/test/common/forms/integration_spec.ts @@ -18,8 +18,7 @@ import { browserDetection } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {Input, Provider, forwardRef} from 'angular2/core'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import { Control, ControlGroup, @@ -34,6 +33,7 @@ import { Validators, Validator } from 'angular2/common'; +import {Input, Provider, forwardRef} from 'angular2/core'; import {By} from 'angular2/platform/browser'; import {ListWrapper} from 'angular2/src/facade/collection'; import {ObservableWrapper} from 'angular2/src/facade/async'; diff --git a/modules/angular2/test/common/pipes/async_pipe_spec.ts b/modules/angular2/test/common/pipes/async_pipe_spec.ts index f59e1c81b8..1268547749 100644 --- a/modules/angular2/test/common/pipes/async_pipe_spec.ts +++ b/modules/angular2/test/common/pipes/async_pipe_spec.ts @@ -22,7 +22,7 @@ import { PromiseWrapper, TimerWrapper } from 'angular2/src/facade/async'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; export function main() { describe("AsyncPipe", () => { diff --git a/modules/angular2/test/compiler/selector_spec.ts b/modules/angular2/test/compiler/selector_spec.ts index a9b4fa5a44..8a0250dd86 100644 --- a/modules/angular2/test/compiler/selector_spec.ts +++ b/modules/angular2/test/compiler/selector_spec.ts @@ -1,5 +1,5 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {SelectorMatcher} from 'angular2/src/compiler/selector'; import {CssSelector} from 'angular2/src/compiler/selector'; import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; diff --git a/modules/angular2/test/core/debug/debug_element_spec.ts b/modules/angular2/test/core/debug/debug_element_spec.ts index 9c793c254b..cf871345f2 100644 --- a/modules/angular2/test/core/debug/debug_element_spec.ts +++ b/modules/angular2/test/core/debug/debug_element_spec.ts @@ -14,7 +14,7 @@ import { TestComponentBuilder } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; diff --git a/modules/angular2/test/core/dom/dom_adapter_spec.ts b/modules/angular2/test/core/dom/dom_adapter_spec.ts index b3e5ba94b8..3920778696 100644 --- a/modules/angular2/test/core/dom/dom_adapter_spec.ts +++ b/modules/angular2/test/core/dom/dom_adapter_spec.ts @@ -14,7 +14,7 @@ import { stringifyElement } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; export function main() { describe('dom adapter', () => { diff --git a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts index 3c1416ec0a..e58c9538c0 100644 --- a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts +++ b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts @@ -24,7 +24,7 @@ import {Component, View, ViewMetadata} from 'angular2/src/core/metadata'; import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader'; import {ElementRef} from 'angular2/src/core/linker/element_ref'; import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {ComponentFixture_} from "angular2/src/testing/test_component_builder"; export function main() { diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/angular2/test/core/linker/integration_spec.ts index 7592a9a7ab..13d53f3dfb 100644 --- a/modules/angular2/test/core/linker/integration_spec.ts +++ b/modules/angular2/test/core/linker/integration_spec.ts @@ -22,7 +22,7 @@ import { } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import { Type, isPresent, diff --git a/modules/angular2/test/core/linker/projection_integration_spec.ts b/modules/angular2/test/core/linker/projection_integration_spec.ts index e30dc0f036..1213e256f5 100644 --- a/modules/angular2/test/core/linker/projection_integration_spec.ts +++ b/modules/angular2/test/core/linker/projection_integration_spec.ts @@ -20,7 +20,7 @@ import { tick } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {AppViewListener} from 'angular2/src/core/linker/view_listener'; import { diff --git a/modules/angular2/test/core/linker/query_list_spec.ts b/modules/angular2/test/core/linker/query_list_spec.ts index 4a5f5a34f3..fe284347dc 100644 --- a/modules/angular2/test/core/linker/query_list_spec.ts +++ b/modules/angular2/test/core/linker/query_list_spec.ts @@ -14,7 +14,7 @@ import {MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/facade/coll import {IS_DART, StringWrapper} from 'angular2/src/facade/lang'; import {ObservableWrapper} from 'angular2/src/facade/async'; import {QueryList} from 'angular2/src/core/linker/query_list'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; interface _JsQueryList { filter(c: any): any; diff --git a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts b/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts index 2262f55ec0..9eceb98636 100644 --- a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts +++ b/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts @@ -14,7 +14,7 @@ import { } from 'angular2/testing_internal'; // import {MapWrapper} from 'angular2/src/facade/collection'; -// import {DOM} from 'angular2/src/core/dom/dom_adapter'; +// import {DOM} from 'angular2/src/platform/dom/dom_adapter'; // import {DomTestbed, TestRootView, elRef} from './dom_testbed'; diff --git a/modules/angular2/test/core/render/dom/events/event_manager_spec.ts b/modules/angular2/test/core/render/dom/events/event_manager_spec.ts index b09680308b..815737246e 100644 --- a/modules/angular2/test/core/render/dom/events/event_manager_spec.ts +++ b/modules/angular2/test/core/render/dom/events/event_manager_spec.ts @@ -13,7 +13,7 @@ import {EventManager, EventManagerPlugin} from 'angular2/core'; import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; export function main() { var domEventPlugin; diff --git a/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts b/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts index 26bde578a5..761f814cda 100644 --- a/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts +++ b/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts @@ -16,7 +16,7 @@ import { proxy } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {DomSharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host'; export function main() { diff --git a/modules/angular2/test/core/render/view_factory_spec.ts b/modules/angular2/test/core/render/view_factory_spec.ts index 0166dfec9c..4e3e69eae7 100644 --- a/modules/angular2/test/core/render/view_factory_spec.ts +++ b/modules/angular2/test/core/render/view_factory_spec.ts @@ -25,7 +25,7 @@ import { RenderComponentTemplate } from 'angular2/src/core/render/api'; import {SpyRenderEventDispatcher} from '../spies'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {ViewEncapsulation} from 'angular2/src/core/metadata'; function beginElement(name: string, attrNameAndValues: string[], eventTargetAndNames: string[], diff --git a/modules/angular2/test/core/spies.dart b/modules/angular2/test/core/spies.dart index 90a5e936d6..4ea88e6af6 100644 --- a/modules/angular2/test/core/spies.dart +++ b/modules/angular2/test/core/spies.dart @@ -12,7 +12,7 @@ import 'package:angular2/src/core/linker/proto_view_factory.dart'; import 'package:angular2/src/core/linker/view_pool.dart'; import 'package:angular2/src/core/linker/view_listener.dart'; import 'package:angular2/src/core/linker/element_injector.dart'; -import 'package:angular2/src/core/dom/dom_adapter.dart'; +import 'package:angular2/src/platform/dom/dom_adapter.dart'; import 'package:angular2/testing_internal.dart'; @proxy diff --git a/modules/angular2/test/core/spies.ts b/modules/angular2/test/core/spies.ts index f608eb7d17..09a65fa9b7 100644 --- a/modules/angular2/test/core/spies.ts +++ b/modules/angular2/test/core/spies.ts @@ -14,7 +14,7 @@ import {AppViewManager} from 'angular2/src/core/linker/view_manager'; import {AppViewPool} from 'angular2/src/core/linker/view_pool'; import {AppViewListener} from 'angular2/src/core/linker/view_listener'; import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; -import {DomAdapter} from 'angular2/src/core/dom/dom_adapter'; +import {DomAdapter} from 'angular2/src/platform/dom/dom_adapter'; import {ClientMessageBroker} from 'angular2/src/web_workers/shared/client_message_broker'; import { diff --git a/modules/angular2/test/platform/bootstrap_spec.ts b/modules/angular2/test/platform/bootstrap_spec.ts index d2e37b451b..6eff80f786 100644 --- a/modules/angular2/test/platform/bootstrap_spec.ts +++ b/modules/angular2/test/platform/bootstrap_spec.ts @@ -17,7 +17,7 @@ import {bootstrap} from 'angular2/platform/browser'; import {ApplicationRef} from 'angular2/src/core/application_ref'; import {Component, Directive, View, OnDestroy, platform} from 'angular2/core'; import {BROWSER_PROVIDERS, BROWSER_APP_PROVIDERS} from 'angular2/platform/browser'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens'; import {PromiseWrapper} from 'angular2/src/facade/async'; import {provide, Inject, Injector, PLATFORM_INITIALIZER, APP_INITIALIZER} from 'angular2/core'; diff --git a/modules/angular2/test/platform/browser/ruler_spec.ts b/modules/angular2/test/platform/browser/ruler_spec.ts index f3ec7c0b96..4c68c9336a 100644 --- a/modules/angular2/test/platform/browser/ruler_spec.ts +++ b/modules/angular2/test/platform/browser/ruler_spec.ts @@ -11,7 +11,7 @@ import { } from 'angular2/testing_internal'; import {SpyElementRef, SpyDomAdapter} from '../../core/spies'; -import {DOM, DomAdapter} from 'angular2/src/core/dom/dom_adapter'; +import {DOM, DomAdapter} from 'angular2/src/platform/dom/dom_adapter'; import {Ruler, Rectangle} from 'angular2/src/platform/browser/ruler'; import {createRectangle} from './rectangle_mock'; diff --git a/modules/angular2/test/platform/browser/title_spec.ts b/modules/angular2/test/platform/browser/title_spec.ts index b8eda62cb9..4a0cadfbc6 100644 --- a/modules/angular2/test/platform/browser/title_spec.ts +++ b/modules/angular2/test/platform/browser/title_spec.ts @@ -1,5 +1,5 @@ import {ddescribe, describe, it, iit, xit, expect, afterEach} from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Title} from 'angular2/platform/browser'; export function main() { diff --git a/modules/angular2/test/router/integration/router_integration_spec.ts b/modules/angular2/test/router/integration/router_integration_spec.ts index a8fc17fc61..8d1fe44a59 100644 --- a/modules/angular2/test/router/integration/router_integration_spec.ts +++ b/modules/angular2/test/router/integration/router_integration_spec.ts @@ -16,7 +16,7 @@ import { import {bootstrap} from 'angular2/bootstrap'; import {Component, Directive, View} from 'angular2/src/core/metadata'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {provide, ViewChild, AfterViewInit} from 'angular2/core'; import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens'; import {RouteConfig, Route, Redirect, AuxRoute} from 'angular2/src/router/route_config_decorator'; diff --git a/modules/angular2/test/router/integration/router_link_spec.ts b/modules/angular2/test/router/integration/router_link_spec.ts index 30a4a3887a..079840eb24 100644 --- a/modules/angular2/test/router/integration/router_link_spec.ts +++ b/modules/angular2/test/router/integration/router_link_spec.ts @@ -38,7 +38,7 @@ import { } from 'angular2/router'; import {RootRouter} from 'angular2/src/router/router'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; export function main() { describe('router-link directive', function() { diff --git a/modules/angular2/test/router/route_config_spec.ts b/modules/angular2/test/router/route_config_spec.ts index 9b9d455bcd..bc1dc5400f 100644 --- a/modules/angular2/test/router/route_config_spec.ts +++ b/modules/angular2/test/router/route_config_spec.ts @@ -13,7 +13,7 @@ import { import {bootstrap} from 'angular2/bootstrap'; import {Component, Directive, View} from 'angular2/src/core/metadata'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {provide} from 'angular2/core'; import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens'; import {Type} from 'angular2/src/facade/lang'; diff --git a/modules/angular2/test/router/router_link_spec.ts b/modules/angular2/test/router/router_link_spec.ts index f6e1816568..b29d160ff6 100644 --- a/modules/angular2/test/router/router_link_spec.ts +++ b/modules/angular2/test/router/router_link_spec.ts @@ -31,7 +31,7 @@ import { ComponentInstruction } from 'angular2/router'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {ComponentInstruction_} from 'angular2/src/router/instruction'; import {PathRecognizer} from 'angular2/src/router/path_recognizer'; import {SyncRouteHandler} from 'angular2/src/router/sync_route_handler'; diff --git a/modules/angular2/test/testing/testing_internal_spec.ts b/modules/angular2/test/testing/testing_internal_spec.ts index 31adb29c31..a12ffe6d3b 100644 --- a/modules/angular2/test/testing/testing_internal_spec.ts +++ b/modules/angular2/test/testing/testing_internal_spec.ts @@ -11,7 +11,7 @@ import { containsRegexp } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {MapWrapper} from 'angular2/src/facade/collection'; import {RegExpWrapper} from 'angular2/src/facade/lang'; diff --git a/modules/angular2/test/upgrade/metadata_spec.ts b/modules/angular2/test/upgrade/metadata_spec.ts index b888453803..22ad243fd1 100644 --- a/modules/angular2/test/upgrade/metadata_spec.ts +++ b/modules/angular2/test/upgrade/metadata_spec.ts @@ -13,7 +13,7 @@ import { import {Component, View} from 'angular2/angular2'; import {getComponentInfo, parseFields} from 'angular2/src/upgrade/metadata'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; export function main() { if (!DOM.supportsDOMEvents()) return; diff --git a/modules/angular2/test/upgrade/upgrade_spec.ts b/modules/angular2/test/upgrade/upgrade_spec.ts index 343b6fcafe..05f53fc456 100644 --- a/modules/angular2/test/upgrade/upgrade_spec.ts +++ b/modules/angular2/test/upgrade/upgrade_spec.ts @@ -10,7 +10,7 @@ import { xdescribe, xit, } from 'angular2/testing_internal'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Component, Class, Inject, EventEmitter, ApplicationRef, provide} from 'angular2/angular2'; import {UpgradeAdapter} from 'angular2/upgrade'; diff --git a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts b/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts index f9ecaa6b53..fb1fd9868d 100644 --- a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts +++ b/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts @@ -11,7 +11,7 @@ import { beforeEachBindings, TestComponentBuilder } from "angular2/testing_internal"; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import { bind, provide, diff --git a/modules/angular2_material/src/components/dialog/dialog.ts b/modules/angular2_material/src/components/dialog/dialog.ts index 0e39809ab4..3f92b36bc7 100644 --- a/modules/angular2_material/src/components/dialog/dialog.ts +++ b/modules/angular2_material/src/components/dialog/dialog.ts @@ -18,7 +18,7 @@ import { import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {isPresent, Type} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {MouseEvent, KeyboardEvent} from 'angular2/src/facade/browser'; import {KeyCodes} from 'angular2_material/src/core/key_codes'; diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.ts b/modules/benchmarks/src/compiler/compiler_benchmark.ts index 82b81e4b62..6ed0a42d3e 100644 --- a/modules/benchmarks/src/compiler/compiler_benchmark.ts +++ b/modules/benchmarks/src/compiler/compiler_benchmark.ts @@ -1,6 +1,6 @@ import {bootstrap} from 'angular2/bootstrap'; import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {PromiseWrapper} from 'angular2/src/facade/async'; import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; import {DateWrapper, Type, print, isPresent} from 'angular2/src/facade/lang'; diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.ts b/modules/benchmarks/src/largetable/largetable_benchmark.ts index f68f5a754f..0895e64eeb 100644 --- a/modules/benchmarks/src/largetable/largetable_benchmark.ts +++ b/modules/benchmarks/src/largetable/largetable_benchmark.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {window, document, gc} from 'angular2/src/facade/browser'; import { getIntParameter, diff --git a/modules/benchmarks/src/naive_infinite_scroll/app.ts b/modules/benchmarks/src/naive_infinite_scroll/app.ts index 94f391d358..b97d4f07b9 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/app.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/app.ts @@ -3,7 +3,7 @@ import {getIntParameter, bindAction} from 'angular2/src/testing/benchmark_util'; import {TimerWrapper} from 'angular2/src/facade/async'; import {ScrollAreaComponent} from './scroll_area'; import {NgIf, NgFor} from 'angular2/common'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {document} from 'angular2/src/facade/browser'; import {Component, Directive, View} from 'angular2/angular2'; diff --git a/modules/benchmarks/src/static_tree/tree_benchmark.ts b/modules/benchmarks/src/static_tree/tree_benchmark.ts index 8a0dc74339..b658cec649 100644 --- a/modules/benchmarks/src/static_tree/tree_benchmark.ts +++ b/modules/benchmarks/src/static_tree/tree_benchmark.ts @@ -14,7 +14,7 @@ import {ComponentRef_} from 'angular2/src/core/linker/dynamic_component_loader'; import {ApplicationRef} from 'angular2/src/core/application_ref'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {window, document, gc} from 'angular2/src/facade/browser'; import { getIntParameter, diff --git a/modules/benchmarks/src/tree/tree_benchmark.ts b/modules/benchmarks/src/tree/tree_benchmark.ts index 2573eb2d9e..6ecb4ccbe4 100644 --- a/modules/benchmarks/src/tree/tree_benchmark.ts +++ b/modules/benchmarks/src/tree/tree_benchmark.ts @@ -12,7 +12,7 @@ import { import {NgIf} from 'angular2/common'; import {ApplicationRef} from 'angular2/src/core/application_ref'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {isPresent} from 'angular2/src/facade/lang'; import {window, document, gc} from 'angular2/src/facade/browser'; import { diff --git a/modules/playground/src/material/demo_common.ts b/modules/playground/src/material/demo_common.ts index c378cda53d..2939c9164d 100644 --- a/modules/playground/src/material/demo_common.ts +++ b/modules/playground/src/material/demo_common.ts @@ -1,7 +1,7 @@ import {print} from 'angular2/src/facade/lang'; import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {isPresent, isBlank, RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {Injectable} from 'angular2/core'; import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter';