Skip to content

Commit 6b5d345

Browse files
committed
refactor(core): adjust imports for move files to the right place
- render/xhr_* -> compiler/xhr_* - render/event_config -> linker/event_config - render/dom/schema -> compiler/schema - render/dom/compiler/* -> compiler/* - render/dom/view/shared_styles_host -> render/dom/shared_styles_host
1 parent 2450a3c commit 6b5d345

Some content is hidden

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

54 files changed

+91
-91
lines changed

modules/angular2/mock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ export * from './src/mock/mock_location_strategy';
22
export {LocationStrategy} from './src/router/location_strategy';
33

44
export {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
5-
export {MockXHR} from 'angular2/src/core/render/xhr_mock';
5+
export {MockXHR} from 'angular2/src/core/compiler/xhr_mock';

modules/angular2/src/core/application_common.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@ import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
1313
import {BrowserGetTestability} from 'angular2/src/core/testability/browser_testability';
1414
import {DOM} from 'angular2/src/core/dom/dom_adapter';
1515
import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async';
16-
import {XHR} from 'angular2/src/core/render/xhr';
17-
import {XHRImpl} from 'angular2/src/core/render/xhr_impl';
16+
import {XHR} from 'angular2/src/core/compiler/xhr';
17+
import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl';
1818
import {
1919
EventManager,
2020
DomEventsPlugin,
2121
EVENT_MANAGER_PLUGINS
2222
} from 'angular2/src/core/render/dom/events/event_manager';
2323
import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events';
2424
import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_gestures';
25-
import {AppRootUrl} from 'angular2/src/core/services/app_root_url';
26-
import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url';
25+
import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url';
26+
import {AnchorBasedAppRootUrl} from 'angular2/src/core/compiler/anchor_based_app_root_url';
2727
import {
2828
ComponentRef,
2929
DynamicComponentLoader
3030
} from 'angular2/src/core/linker/dynamic_component_loader';
3131
import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability';
3232
import {Renderer} from 'angular2/src/core/render/api';
3333
import {DomRenderer, DOCUMENT, APP_ID_RANDOM_BINDING} from 'angular2/src/core/render/render';
34-
import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
34+
import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry';
3535
import {
3636
DomElementSchemaRegistry
37-
} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry';
37+
} from 'angular2/src/core/compiler/schema/dom_element_schema_registry';
3838
import {
3939
SharedStylesHost,
4040
DomSharedStylesHost
41-
} from 'angular2/src/core/render/dom/view/shared_styles_host';
41+
} from 'angular2/src/core/render/dom/shared_styles_host';
4242
import {EXCEPTION_BINDING} from './platform_bindings';
4343
import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
4444
import {BrowserDetails} from 'angular2/src/animate/browser_details';

modules/angular2/src/core/application_ref.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {DEFAULT_PIPES} from 'angular2/src/core/pipes';
3535
import {ViewResolver} from './linker/view_resolver';
3636
import {DirectiveResolver} from './linker/directive_resolver';
3737
import {PipeResolver} from './linker/pipe_resolver';
38-
import {UrlResolver} from 'angular2/src/core/services/url_resolver';
38+
import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
3939
import {
4040
APP_ID_RANDOM_BINDING,
4141
} from 'angular2/src/core/render/render';

modules/angular2/src/core/compiler/anchor_based_app_root_url.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {AppRootUrl} from "angular2/src/core/services/app_root_url";
1+
import {AppRootUrl} from "angular2/src/core/compiler/app_root_url";
22
import {DOM} from "angular2/src/core/dom/dom_adapter";
33
import {Injectable} from "angular2/src/core/di";
44

modules/angular2/src/core/compiler/compiler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import {TemplateCompiler} from 'angular2/src/core/compiler/template_compiler';
1919
import {ChangeDetectorGenConfig} from 'angular2/src/core/change_detection/change_detection';
2020
import {Compiler} from 'angular2/src/core/linker/compiler';
2121
import {RuntimeCompiler} from 'angular2/src/core/compiler/runtime_compiler';
22-
import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
22+
import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry';
2323
import {
2424
DomElementSchemaRegistry
25-
} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry';
25+
} from 'angular2/src/core/compiler/schema/dom_element_schema_registry';
2626

2727
export function compilerBindings(): Array<Type | Binding | any[]> {
2828
return [

modules/angular2/src/core/compiler/directive_metadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
CHANGE_DECTION_STRATEGY_VALUES
1414
} from 'angular2/src/core/change_detection/change_detection';
1515
import {ViewEncapsulation, VIEW_ENCAPSULATION_VALUES} from 'angular2/src/core/render/api';
16-
import {CssSelector} from 'angular2/src/core/render/dom/compiler/selector';
16+
import {CssSelector} from 'angular2/src/core/compiler/selector';
1717
import {splitAtColon} from './util';
1818
import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces';
1919

modules/angular2/src/core/compiler/style_compiler.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {CompileTypeMetadata, CompileTemplateMetadata} from './directive_metadata';
22
import {SourceModule, SourceExpression, moduleRef} from './source_module';
33
import {ViewEncapsulation} from 'angular2/src/core/render/api';
4-
import {XHR} from 'angular2/src/core/render/xhr';
4+
import {XHR} from 'angular2/src/core/compiler/xhr';
55
import {StringWrapper, isBlank} from 'angular2/src/core/facade/lang';
66
import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
7-
import {ShadowCss} from 'angular2/src/core/render/dom/compiler/shadow_css';
8-
import {UrlResolver} from 'angular2/src/core/services/url_resolver';
7+
import {ShadowCss} from 'angular2/src/core/compiler/shadow_css';
8+
import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
99
import {resolveStyleUrls} from './style_url_resolver';
1010
import {
1111
escapeSingleQuoteString,
@@ -148,4 +148,4 @@ function componentId(appId: string, templateId: number): string {
148148

149149
function componentIdExpression(appIdExpression: string, templateIdExpression: string): string {
150150
return `${appIdExpression}+'-'+${codeGenToString(templateIdExpression)}`;
151-
}
151+
}

modules/angular2/src/core/compiler/style_url_resolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/webcomponents/webcomponentsjs/blob/master/src/HTMLImports/path.js
33

44
import {RegExp, RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang';
5-
import {UrlResolver} from 'angular2/src/core/services/url_resolver';
5+
import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
66

77
/**
88
* Rewrites URLs by resolving '@import' and 'url()' URLs from the given base URL,

modules/angular2/src/core/compiler/template_normalizer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
77
import {BaseException} from 'angular2/src/core/facade/exceptions';
88
import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
99

10-
import {XHR} from 'angular2/src/core/render/xhr';
11-
import {UrlResolver} from 'angular2/src/core/services/url_resolver';
10+
import {XHR} from 'angular2/src/core/compiler/xhr';
11+
import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
1212
import {resolveStyleUrls} from './style_url_resolver';
1313
import {Injectable} from 'angular2/src/core/di';
1414
import {ViewEncapsulation} from 'angular2/src/core/render/api';

modules/angular2/src/core/compiler/template_parser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ import {
3535
DirectiveAst,
3636
BoundDirectivePropertyAst
3737
} from './template_ast';
38-
import {CssSelector, SelectorMatcher} from 'angular2/src/core/render/dom/compiler/selector';
38+
import {CssSelector, SelectorMatcher} from 'angular2/src/core/compiler/selector';
3939

40-
import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
40+
import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry';
4141
import {preparseElement, PreparsedElement, PreparsedElementType} from './template_preparser';
4242

4343
import {

0 commit comments

Comments
 (0)