From b7b3c850339567fb8a650d55d61dcf052f08efd7 Mon Sep 17 00:00:00 2001
From: vsavkin <avix1000@gmail.com>
Date: Tue, 24 Nov 2015 15:05:04 -0800
Subject: [PATCH] refactor(core): move EventManager from core to platform/dom

Closes #5465
---
 modules/angular2/angular2.dart                             | 1 +
 modules/angular2/angular2.ts                               | 1 +
 modules/angular2/platform/common_dom.ts                    | 5 +++++
 modules/angular2/src/core/application_common_providers.ts  | 4 +---
 modules/angular2/src/core/render.ts                        | 4 +---
 modules/angular2/src/platform/browser_common.ts            | 7 ++++---
 modules/angular2/src/platform/dom/dom_renderer.ts          | 5 +++--
 modules/angular2/src/platform/dom/events/dom_events.ts     | 3 ++-
 .../{core/render => platform/dom/events}/event_manager.ts  | 0
 modules/angular2/src/platform/dom/events/hammer_common.ts  | 2 +-
 modules/angular2/src/platform/dom/events/key_events.ts     | 2 +-
 modules/angular2/src/testing/test_injector.ts              | 7 +++++--
 modules/angular2/src/web_workers/ui/di_bindings.ts         | 2 +-
 .../dom/dom_renderer_integration_spec.ts                   | 0
 .../render => platform}/dom/events/event_manager_spec.ts   | 2 +-
 .../render => platform}/dom/events/key_events_spec.ts      | 0
 .../render => platform}/dom/shared_styles_host_spec.ts     | 0
 17 files changed, 27 insertions(+), 18 deletions(-)
 rename modules/angular2/src/{core/render => platform/dom/events}/event_manager.ts (100%)
 rename modules/angular2/test/{core/render => platform}/dom/dom_renderer_integration_spec.ts (100%)
 rename modules/angular2/test/{core/render => platform}/dom/events/event_manager_spec.ts (98%)
 rename modules/angular2/test/{core/render => platform}/dom/events/key_events_spec.ts (100%)
 rename modules/angular2/test/{core/render => platform}/dom/shared_styles_host_spec.ts (100%)

diff --git a/modules/angular2/angular2.dart b/modules/angular2/angular2.dart
index 4b6db99b4f..38c6812a65 100644
--- a/modules/angular2/angular2.dart
+++ b/modules/angular2/angular2.dart
@@ -13,5 +13,6 @@ 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/src/platform/dom/events/event_manager.dart';
 export 'package:angular2/src/compiler/url_resolver.dart';
 export 'package:angular2/src/compiler/app_root_url.dart';
\ No newline at end of file
diff --git a/modules/angular2/angular2.ts b/modules/angular2/angular2.ts
index 264768fb42..e3d0361346 100644
--- a/modules/angular2/angular2.ts
+++ b/modules/angular2/angular2.ts
@@ -3,5 +3,6 @@ export * from './core';
 export * from './instrumentation';
 export * from './platform/browser';
 export * from './src/platform/dom/dom_adapter';
+export * from './src/platform/dom/events/event_manager';
 export * from './upgrade';
 export {UrlResolver, AppRootUrl} from './compiler';
diff --git a/modules/angular2/platform/common_dom.ts b/modules/angular2/platform/common_dom.ts
index 0ee82f355a..c74e5ee84b 100644
--- a/modules/angular2/platform/common_dom.ts
+++ b/modules/angular2/platform/common_dom.ts
@@ -6,5 +6,10 @@ 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';
 export {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events';
+export {
+  EVENT_MANAGER_PLUGINS,
+  EventManager,
+  EventManagerPlugin
+} from 'angular2/src/platform/dom/events/event_manager';
 export * from 'angular2/src/platform/dom/debug/by';
 export * from 'angular2/src/platform/dom/debug/debug_element_view_listener';
\ No newline at end of file
diff --git a/modules/angular2/src/core/application_common_providers.ts b/modules/angular2/src/core/application_common_providers.ts
index 3498b85d05..b0aa60bc71 100644
--- a/modules/angular2/src/core/application_common_providers.ts
+++ b/modules/angular2/src/core/application_common_providers.ts
@@ -24,7 +24,6 @@ import {Compiler} from './linker/compiler';
 import {Compiler_} from "./linker/compiler";
 import {DynamicComponentLoader} from './linker/dynamic_component_loader';
 import {DynamicComponentLoader_} from "./linker/dynamic_component_loader";
-import {EventManager} from './render';
 
 /**
  * A default set of providers which should be included in any Angular
@@ -44,6 +43,5 @@ export const APPLICATION_COMMON_PROVIDERS: Array<Type | Provider | any[]> = CONS
   new Provider(KeyValueDiffers, {useValue: defaultKeyValueDiffers}),
   DirectiveResolver,
   PipeResolver,
-  new Provider(DynamicComponentLoader, {useClass: DynamicComponentLoader_}),
-  EventManager
+  new Provider(DynamicComponentLoader, {useClass: DynamicComponentLoader_})
 ]);
\ No newline at end of file
diff --git a/modules/angular2/src/core/render.ts b/modules/angular2/src/core/render.ts
index f58c803510..7976f27931 100644
--- a/modules/angular2/src/core/render.ts
+++ b/modules/angular2/src/core/render.ts
@@ -16,6 +16,4 @@ export {
   RenderEmbeddedTemplateCmd,
   RenderBeginCmd,
   RenderComponentTemplate
-} from './render/api';
-
-export {EventManager, EventManagerPlugin, EVENT_MANAGER_PLUGINS} from './render/event_manager';
\ No newline at end of file
+} from './render/api';
\ No newline at end of file
diff --git a/modules/angular2/src/platform/browser_common.ts b/modules/angular2/src/platform/browser_common.ts
index 2d990c0d50..3e51dca1e5 100644
--- a/modules/angular2/src/platform/browser_common.ts
+++ b/modules/angular2/src/platform/browser_common.ts
@@ -12,8 +12,7 @@ import {
   Renderer,
   reflector,
   APPLICATION_COMMON_PROVIDERS,
-  PLATFORM_COMMON_PROVIDERS,
-  EVENT_MANAGER_PLUGINS
+  PLATFORM_COMMON_PROVIDERS
 } from "angular2/core";
 import {COMMON_DIRECTIVES, COMMON_PIPES, FORM_PROVIDERS} from "angular2/common";
 import {Testability} from 'angular2/src/core/testability/testability';
@@ -30,6 +29,7 @@ import {AnimationBuilder} from "angular2/src/animate/animation_builder";
 import {BrowserDomAdapter} from './browser/browser_adapter';
 import {BrowserGetTestability} from 'angular2/src/platform/browser/testability';
 import {wtfInit} from 'angular2/src/core/profile/wtf_init';
+import {EventManager, EVENT_MANAGER_PLUGINS} from "angular2/src/platform/dom/events/event_manager";
 export {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
 export {Title} from 'angular2/src/platform/browser/title';
 export {
@@ -71,7 +71,8 @@ export const BROWSER_APP_COMMON_PROVIDERS: Array<any /*Type | Provider | any[]*/
   DomSharedStylesHost,
   Testability,
   BrowserDetails,
-  AnimationBuilder
+  AnimationBuilder,
+  EventManager
 ]);
 
 export function initDomAdapter() {
diff --git a/modules/angular2/src/platform/dom/dom_renderer.ts b/modules/angular2/src/platform/dom/dom_renderer.ts
index cf2a74e6a8..f3f734a72b 100644
--- a/modules/angular2/src/platform/dom/dom_renderer.ts
+++ b/modules/angular2/src/platform/dom/dom_renderer.ts
@@ -23,10 +23,11 @@ import {
   RenderViewWithFragments,
   RenderTemplateCmd,
   RenderEventDispatcher,
-  RenderComponentTemplate,
-  EventManager
+  RenderComponentTemplate
 } from 'angular2/core';
 
+import {EventManager} from './events/event_manager';
+
 import {DOCUMENT} from './dom_tokens';
 import {
   createRenderView,
diff --git a/modules/angular2/src/platform/dom/events/dom_events.ts b/modules/angular2/src/platform/dom/events/dom_events.ts
index 1121efa78e..a90480d992 100644
--- a/modules/angular2/src/platform/dom/events/dom_events.ts
+++ b/modules/angular2/src/platform/dom/events/dom_events.ts
@@ -1,5 +1,6 @@
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
-import {Injectable, EventManagerPlugin, EventManager} from 'angular2/core';
+import {Injectable} from 'angular2/core';
+import {EventManagerPlugin, EventManager} from './event_manager';
 
 @Injectable()
 export class DomEventsPlugin extends EventManagerPlugin {
diff --git a/modules/angular2/src/core/render/event_manager.ts b/modules/angular2/src/platform/dom/events/event_manager.ts
similarity index 100%
rename from modules/angular2/src/core/render/event_manager.ts
rename to modules/angular2/src/platform/dom/events/event_manager.ts
diff --git a/modules/angular2/src/platform/dom/events/hammer_common.ts b/modules/angular2/src/platform/dom/events/hammer_common.ts
index 0229de4bc1..6b8630e6b4 100644
--- a/modules/angular2/src/platform/dom/events/hammer_common.ts
+++ b/modules/angular2/src/platform/dom/events/hammer_common.ts
@@ -1,4 +1,4 @@
-import {EventManagerPlugin} from 'angular2/core';
+import {EventManagerPlugin} from './event_manager';
 import {StringMapWrapper} from 'angular2/src/facade/collection';
 
 var _eventNames = {
diff --git a/modules/angular2/src/platform/dom/events/key_events.ts b/modules/angular2/src/platform/dom/events/key_events.ts
index cc969c2b7b..9c625dc278 100644
--- a/modules/angular2/src/platform/dom/events/key_events.ts
+++ b/modules/angular2/src/platform/dom/events/key_events.ts
@@ -7,7 +7,7 @@ import {
   NumberWrapper
 } from 'angular2/src/facade/lang';
 import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {EventManagerPlugin} from 'angular2/core';
+import {EventManagerPlugin} from './event_manager';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {Injectable} from 'angular2/src/core/di';
 
diff --git a/modules/angular2/src/testing/test_injector.ts b/modules/angular2/src/testing/test_injector.ts
index 21bef44e65..efc5c8499b 100644
--- a/modules/angular2/src/testing/test_injector.ts
+++ b/modules/angular2/src/testing/test_injector.ts
@@ -21,7 +21,6 @@ import {NgZone} from 'angular2/src/core/zone/ng_zone';
 
 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';
 import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
 import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy';
@@ -31,7 +30,11 @@ import {MockNgZone} from 'angular2/src/mock/ng_zone_mock';
 import {TestComponentBuilder} from './test_component_builder';
 
 import {Injector} from 'angular2/src/core/di';
-import {ELEMENT_PROBE_PROVIDERS} from 'angular2/platform/common_dom';
+import {
+  EventManager,
+  EVENT_MANAGER_PLUGINS,
+  ELEMENT_PROBE_PROVIDERS
+} from 'angular2/platform/common_dom';
 
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {FunctionWrapper, Type} from 'angular2/src/facade/lang';
diff --git a/modules/angular2/src/web_workers/ui/di_bindings.ts b/modules/angular2/src/web_workers/ui/di_bindings.ts
index 2ec3120fe8..d0f0e4a553 100644
--- a/modules/angular2/src/web_workers/ui/di_bindings.ts
+++ b/modules/angular2/src/web_workers/ui/di_bindings.ts
@@ -5,7 +5,7 @@ import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
 import {BrowserDetails} from 'angular2/src/animate/browser_details';
 import {Reflector, reflector} from 'angular2/src/core/reflection/reflection';
 import {Parser, Lexer} from 'angular2/src/core/change_detection/change_detection';
-import {EventManager, EVENT_MANAGER_PLUGINS} from 'angular2/core';
+import {EventManager, EVENT_MANAGER_PLUGINS} from 'angular2/platform/common_dom';
 import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory';
 import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter';
 import {KeyEventsPlugin} from 'angular2/src/platform/dom/events/key_events';
diff --git a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts b/modules/angular2/test/platform/dom/dom_renderer_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts
rename to modules/angular2/test/platform/dom/dom_renderer_integration_spec.ts
diff --git a/modules/angular2/test/core/render/dom/events/event_manager_spec.ts b/modules/angular2/test/platform/dom/events/event_manager_spec.ts
similarity index 98%
rename from modules/angular2/test/core/render/dom/events/event_manager_spec.ts
rename to modules/angular2/test/platform/dom/events/event_manager_spec.ts
index 815737246e..2e34eefab2 100644
--- a/modules/angular2/test/core/render/dom/events/event_manager_spec.ts
+++ b/modules/angular2/test/platform/dom/events/event_manager_spec.ts
@@ -9,7 +9,7 @@ import {
   beforeEach,
   el
 } from 'angular2/testing_internal';
-import {EventManager, EventManagerPlugin} from 'angular2/core';
+import {EventManager, EventManagerPlugin} from 'angular2/platform/common_dom';
 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';
diff --git a/modules/angular2/test/core/render/dom/events/key_events_spec.ts b/modules/angular2/test/platform/dom/events/key_events_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/dom/events/key_events_spec.ts
rename to modules/angular2/test/platform/dom/events/key_events_spec.ts
diff --git a/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts b/modules/angular2/test/platform/dom/shared_styles_host_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/dom/shared_styles_host_spec.ts
rename to modules/angular2/test/platform/dom/shared_styles_host_spec.ts