diff --git a/modules/angular2/src/core/application.js b/modules/angular2/src/core/application.js index 41e7e4009f..55f6f11b5e 100644 --- a/modules/angular2/src/core/application.js +++ b/modules/angular2/src/core/application.js @@ -22,8 +22,8 @@ import {HammerGesturesPlugin} from 'angular2/src/render/dom/events/hammer_gestur import {Binding} from 'angular2/src/di/binding'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {Component} from 'angular2/src/core/annotations/annotations'; import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader'; diff --git a/modules/angular2/src/core/compiler/element_injector.js b/modules/angular2/src/core/compiler/element_injector.js index a8c65945a3..b52fcd4a44 100644 --- a/modules/angular2/src/core/compiler/element_injector.js +++ b/modules/angular2/src/core/compiler/element_injector.js @@ -10,7 +10,7 @@ import {NgElement} from 'angular2/src/core/dom/element'; import {Directive, onChange, onDestroy, onAllChangesDone} from 'angular2/src/core/annotations/annotations'; import {BindingPropagationConfig} from 'angular2/change_detection'; import * as pclModule from 'angular2/src/core/compiler/private_component_location'; -import {setterFactory} from './property_setter_factory'; +import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory'; var _MAX_DIRECTIVE_CONSTRUCTION_COUNTER = 10; diff --git a/modules/angular2/src/core/compiler/pipeline/directive_parser.js b/modules/angular2/src/core/compiler/pipeline/directive_parser.js index 34994526d3..f07b65efbc 100644 --- a/modules/angular2/src/core/compiler/pipeline/directive_parser.js +++ b/modules/angular2/src/core/compiler/pipeline/directive_parser.js @@ -1,8 +1,7 @@ import {isPresent, isBlank, BaseException, assertionsEnabled, RegExpWrapper} from 'angular2/src/facade/lang'; import {List, MapWrapper} from 'angular2/src/facade/collection'; import {DOM} from 'angular2/src/dom/dom_adapter'; -import {SelectorMatcher} from '../selector'; -import {CssSelector} from '../selector'; +import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector'; import {DirectiveMetadata} from '../directive_metadata'; import {DynamicComponent, Component, Viewport} from '../../annotations/annotations'; diff --git a/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js b/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js index af7c52c3e5..4387d55c1f 100644 --- a/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js +++ b/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js @@ -11,7 +11,7 @@ import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; import {CompileControl} from './compile_control'; import {dashCaseToCamelCase} from '../string_utils'; -import {setterFactory} from '../property_setter_factory' +import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory' /** * Creates the ElementBinders and adds watches to the diff --git a/modules/angular2/src/core/compiler/shadow_dom_strategy.js b/modules/angular2/src/core/compiler/shadow_dom_strategy.js index b3b2e418f5..8ed7cf8f70 100644 --- a/modules/angular2/src/core/compiler/shadow_dom_strategy.js +++ b/modules/angular2/src/core/compiler/shadow_dom_strategy.js @@ -8,10 +8,10 @@ import {DOM} from 'angular2/src/dom/dom_adapter'; import * as viewModule from './view'; import {LightDom} from './shadow_dom_emulation/light_dom'; -import {ShadowCss} from './shadow_dom_emulation/shadow_css'; +import {ShadowCss} from 'angular2/src/render/dom/shadow_dom/shadow_css'; -import {StyleInliner} from './style_inliner'; -import {StyleUrlResolver} from './style_url_resolver'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {DirectiveMetadata} from './directive_metadata'; @@ -105,7 +105,7 @@ export class EmulatedUnscopedShadowDomStrategy extends ShadowDomStrategy { getTemplateCompileStep(cmpMetadata: DirectiveMetadata): NS.CompileStep { return new _BaseEmulatedShadowDomStep(); - } + } } /** @@ -190,7 +190,7 @@ class _BaseEmulatedShadowDomStep extends NS.CompileStep { DOM.remove(current.element); current.element = contentStart; - } + } } } diff --git a/modules/angular2/src/dom/parse5_adapter.cjs b/modules/angular2/src/dom/parse5_adapter.cjs index 52a28e7f3f..c209ae7146 100644 --- a/modules/angular2/src/dom/parse5_adapter.cjs +++ b/modules/angular2/src/dom/parse5_adapter.cjs @@ -10,7 +10,7 @@ var url = require('url'); import {List, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {DomAdapter, setRootDomAdapter} from './dom_adapter'; import {BaseException, isPresent, isBlank} from 'angular2/src/facade/lang'; -import {SelectorMatcher, CssSelector} from 'angular2/src/core/compiler/selector'; +import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector'; var _attrToPropMap = { 'innerHtml': 'innerHTML', diff --git a/modules/angular2/src/render/dom/compiler/directive_parser.js b/modules/angular2/src/render/dom/compiler/directive_parser.js index 55712286ad..632f605bc2 100644 --- a/modules/angular2/src/render/dom/compiler/directive_parser.js +++ b/modules/angular2/src/render/dom/compiler/directive_parser.js @@ -3,13 +3,13 @@ import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {DOM} from 'angular2/src/dom/dom_adapter'; import {Parser} from 'angular2/change_detection'; -import {SelectorMatcher, CssSelector} from './selector'; +import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; import {CompileControl} from './compile_control'; -import {setterFactory} from './property_setter_factory'; +import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory'; import {DirectiveMetadata} from '../../api'; import {dashCaseToCamelCase, camelCaseToDashCase} from '../util'; diff --git a/modules/angular2/src/render/dom/compiler/property_binding_parser.js b/modules/angular2/src/render/dom/compiler/property_binding_parser.js index 80ae47064e..8158a95558 100644 --- a/modules/angular2/src/render/dom/compiler/property_binding_parser.js +++ b/modules/angular2/src/render/dom/compiler/property_binding_parser.js @@ -8,7 +8,7 @@ import {CompileElement} from './compile_element'; import {CompileControl} from './compile_control'; import {dashCaseToCamelCase} from '../util'; -import {setterFactory} from './property_setter_factory'; +import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory'; // Group 1 = "bind-" // Group 2 = "var-" or "#" diff --git a/modules/angular2/src/core/compiler/property_setter_factory.js b/modules/angular2/src/render/dom/compiler/property_setter_factory.js similarity index 98% rename from modules/angular2/src/core/compiler/property_setter_factory.js rename to modules/angular2/src/render/dom/compiler/property_setter_factory.js index 4240f2bd77..fdf3909e73 100644 --- a/modules/angular2/src/core/compiler/property_setter_factory.js +++ b/modules/angular2/src/render/dom/compiler/property_setter_factory.js @@ -1,7 +1,7 @@ import {StringWrapper, RegExpWrapper, BaseException, isPresent, isBlank, isString, stringify} from 'angular2/src/facade/lang'; import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {DOM} from 'angular2/src/dom/dom_adapter'; -import {camelCaseToDashCase, dashCaseToCamelCase} from './string_utils'; +import {camelCaseToDashCase, dashCaseToCamelCase} from '../util'; import {reflector} from 'angular2/src/reflection/reflection'; const STYLE_SEPARATOR = '.'; diff --git a/modules/angular2/src/core/compiler/selector.js b/modules/angular2/src/render/dom/compiler/selector.js similarity index 100% rename from modules/angular2/src/core/compiler/selector.js rename to modules/angular2/src/render/dom/compiler/selector.js diff --git a/modules/angular2/src/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy.js b/modules/angular2/src/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy.js index d25600e1a2..dda957ce63 100644 --- a/modules/angular2/src/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy.js +++ b/modules/angular2/src/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy.js @@ -3,8 +3,8 @@ import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {DOM} from 'angular2/src/dom/dom_adapter'; -import {StyleInliner} from './style_inliner'; -import {StyleUrlResolver} from './style_url_resolver'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {EmulatedUnscopedShadowDomStrategy} from './emulated_unscoped_shadow_dom_strategy'; import { getContentAttribute, getHostAttribute, getComponentId, shimCssForComponent, insertStyleElement diff --git a/modules/angular2/src/core/compiler/shadow_dom_emulation/shadow_css.js b/modules/angular2/src/render/dom/shadow_dom/shadow_css.js similarity index 100% rename from modules/angular2/src/core/compiler/shadow_dom_emulation/shadow_css.js rename to modules/angular2/src/render/dom/shadow_dom/shadow_css.js diff --git a/modules/angular2/src/core/compiler/style_inliner.js b/modules/angular2/src/render/dom/shadow_dom/style_inliner.js similarity index 98% rename from modules/angular2/src/core/compiler/style_inliner.js rename to modules/angular2/src/render/dom/shadow_dom/style_inliner.js index 88942d15e1..24b7faf3be 100644 --- a/modules/angular2/src/core/compiler/style_inliner.js +++ b/modules/angular2/src/render/dom/shadow_dom/style_inliner.js @@ -1,9 +1,10 @@ import {Injectable} from 'angular2/di'; import {XHR} from 'angular2/src/services/xhr'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; - import {ListWrapper} from 'angular2/src/facade/collection'; + +import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {StyleUrlResolver} from './style_url_resolver'; + import { isBlank, isPresent, diff --git a/modules/angular2/src/core/compiler/style_url_resolver.js b/modules/angular2/src/render/dom/shadow_dom/style_url_resolver.js similarity index 100% rename from modules/angular2/src/core/compiler/style_url_resolver.js rename to modules/angular2/src/render/dom/shadow_dom/style_url_resolver.js diff --git a/modules/angular2/src/test_lib/test_injector.js b/modules/angular2/src/test_lib/test_injector.js index 7ff1b3f3a8..7350f04b85 100644 --- a/modules/angular2/src/test_lib/test_injector.js +++ b/modules/angular2/src/test_lib/test_injector.js @@ -11,8 +11,8 @@ import {XHR} from 'angular2/src/services/xhr'; import {XHRMock} from 'angular2/src/mock/xhr_mock'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {Injector} from 'angular2/di'; diff --git a/modules/angular2/test/core/compiler/compiler_common_tests.js b/modules/angular2/test/core/compiler/compiler_common_tests.js index 3163e8966b..e873b4bc8d 100644 --- a/modules/angular2/test/core/compiler/compiler_common_tests.js +++ b/modules/angular2/test/core/compiler/compiler_common_tests.js @@ -28,7 +28,7 @@ import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver'; import {ComponentUrlMapper, RuntimeComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {Lexer, Parser, dynamicChangeDetection} from 'angular2/change_detection'; diff --git a/modules/angular2/test/core/compiler/integration_spec.js b/modules/angular2/test/core/compiler/integration_spec.js index eb184a54f3..5ca1ae083f 100644 --- a/modules/angular2/test/core/compiler/integration_spec.js +++ b/modules/angular2/test/core/compiler/integration_spec.js @@ -29,7 +29,7 @@ import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {EventManager} from 'angular2/src/render/dom/events/event_manager'; diff --git a/modules/angular2/test/core/compiler/shadow_dom/shadow_css_spec.js b/modules/angular2/test/core/compiler/shadow_dom/shadow_css_spec.js deleted file mode 100644 index 8bbf754c55..0000000000 --- a/modules/angular2/test/core/compiler/shadow_dom/shadow_css_spec.js +++ /dev/null @@ -1,117 +0,0 @@ -import {describe, beforeEach, it, expect, ddescribe, iit, SpyObject, el} from 'angular2/test_lib'; -import {ShadowCss} from 'angular2/src/core/compiler/shadow_dom_emulation/shadow_css'; - -import {RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; - -export function main() { - describe('ShadowCss', function() { - - function s(css: string, contentAttr:string, hostAttr:string = '') { - var shadowCss = new ShadowCss(); - var shim = shadowCss.shimCssText(css, contentAttr, hostAttr); - var nlRegexp = RegExpWrapper.create('\\n'); - return StringWrapper.replaceAll(shim, nlRegexp, ''); - } - - it('should handle empty string', () => { - expect(s('', 'a')).toEqual(''); - }); - - it('should add an attribute to every rule', () => { - var css = 'one {color: red;}two {color: red;}'; - var expected = 'one[a] {color: red;}two[a] {color: red;}'; - expect(s(css, 'a')).toEqual(expected); - }); - - it('should hanlde invalid css', () => { - var css = 'one {color: red;}garbage'; - var expected = 'one[a] {color: red;}'; - expect(s(css, 'a')).toEqual(expected); - }); - - it('should add an attribute to every selector', () => { - var css = 'one, two {color: red;}'; - var expected = 'one[a], two[a] {color: red;}'; - expect(s(css, 'a')).toEqual(expected); - }); - - it('should handle media rules', () => { - var css = '@media screen and (max-width: 800px) {div {font-size: 50px;}}'; - var expected = '@media screen and (max-width: 800px) {div[a] {font-size: 50px;}}'; - expect(s(css, 'a')).toEqual(expected); - }); - - it('should handle media rules with simple rules', () => { - var css = '@media screen and (max-width: 800px) {div {font-size: 50px;}} div {}'; - var expected = '@media screen and (max-width: 800px) {div[a] {font-size: 50px;}}div[a] {}'; - expect(s(css, 'a')).toEqual(expected); - }); - - it('should handle complicated selectors', () => { - expect(s('one::before {}', 'a')).toEqual('one[a]::before {}'); - expect(s('one two {}', 'a')).toEqual('one[a] two[a] {}'); - expect(s('one>two {}', 'a')).toEqual('one[a] > two[a] {}'); - expect(s('one+two {}', 'a')).toEqual('one[a] + two[a] {}'); - expect(s('one~two {}', 'a')).toEqual('one[a] ~ two[a] {}'); - expect(s('.one.two > three {}', 'a')).toEqual('.one.two[a] > three[a] {}'); - expect(s('one[attr="value"] {}', 'a')).toEqual('one[attr="value"][a] {}'); - expect(s('one[attr=value] {}', 'a')).toEqual('one[attr="value"][a] {}'); - expect(s('one[attr^="value"] {}', 'a')).toEqual('one[attr^="value"][a] {}'); - expect(s('one[attr$="value"] {}', 'a')).toEqual('one[attr$="value"][a] {}'); - expect(s('one[attr*="value"] {}', 'a')).toEqual('one[attr*="value"][a] {}'); - expect(s('one[attr|="value"] {}', 'a')).toEqual('one[attr|="value"][a] {}'); - expect(s('one[attr] {}', 'a')).toEqual('one[attr][a] {}'); - expect(s('[is="one"] {}', 'a')).toEqual('[is="one"][a] {}'); - }); - - it('should handle :host', () => { - expect(s(':host {}', 'a', 'a-host')).toEqual('[a-host] {}'); - expect(s(':host(.x,.y) {}', 'a', 'a-host')).toEqual('[a-host].x, [a-host].y {}'); - expect(s(':host(.x,.y) > .z {}', 'a', 'a-host')).toEqual('[a-host].x > .z, [a-host].y > .z {}'); - }); - - it('should handle :host-context', () => { - expect(s(':host-context(.x) {}', 'a', 'a-host')).toEqual('[a-host].x, .x [a-host] {}'); - expect(s(':host-context(.x) > .y {}', 'a', 'a-host')).toEqual('[a-host].x > .y, .x [a-host] > .y {}'); - }); - - it('should support polyfill-next-selector', () => { - var css = s("polyfill-next-selector {content: 'x > y'} z {}", 'a'); - expect(css).toEqual('x[a] > y[a] {}'); - - css = s('polyfill-next-selector {content: "x > y"} z {}', 'a'); - expect(css).toEqual('x[a] > y[a] {}'); - }); - - it('should support polyfill-unscoped-rule', () => { - var css = s("polyfill-unscoped-rule {content: '#menu > .bar';background: blue;}", 'a'); - expect(StringWrapper.contains(css, '#menu > .bar {;background: blue;}')).toBeTruthy(); - - css = s('polyfill-unscoped-rule {content: "#menu > .bar";background: blue;}', 'a'); - expect(StringWrapper.contains(css, '#menu > .bar {;background: blue;}')).toBeTruthy(); - }); - - it('should support polyfill-rule', () => { - var css = s("polyfill-rule {content: ':host.foo .bar';background: blue;}", 'a', 'a-host'); - expect(css).toEqual('[a-host].foo .bar {background: blue;}'); - - css = s('polyfill-rule {content: ":host.foo .bar";background: blue;}', 'a', 'a-host'); - expect(css).toEqual('[a-host].foo .bar {background: blue;}'); - }); - - it('should handle ::shadow', () => { - var css = s('x::shadow > y {}', 'a'); - expect(css).toEqual('x[a] > y[a] {}'); - }); - - it('should handle /deep/', () => { - var css = s('x /deep/ y {}', 'a'); - expect(css).toEqual('x[a] y[a] {}'); - }); - - it('should handle >>>', () => { - var css = s('x >>> y {}', 'a'); - expect(css).toEqual('x[a] y[a] {}'); - }); - }); -} diff --git a/modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js b/modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js index b118d5ec8b..530201e34b 100644 --- a/modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js +++ b/modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js @@ -30,8 +30,8 @@ import {ShadowDomStrategy, import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock'; diff --git a/modules/angular2/test/core/compiler/shadow_dom_strategy_spec.js b/modules/angular2/test/core/compiler/shadow_dom_strategy_spec.js index f95019ca5d..08c5197b3a 100644 --- a/modules/angular2/test/core/compiler/shadow_dom_strategy_spec.js +++ b/modules/angular2/test/core/compiler/shadow_dom_strategy_spec.js @@ -18,8 +18,8 @@ import { resetShadowDomCache, } from 'angular2/src/core/compiler/shadow_dom_strategy'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {ProtoView} from 'angular2/src/core/compiler/view'; import {DirectiveMetadata} from 'angular2/src/core/compiler/directive_metadata'; diff --git a/modules/angular2/test/directives/if_spec.js b/modules/angular2/test/directives/if_spec.js index 2b5c33dba4..24189c2714 100644 --- a/modules/angular2/test/directives/if_spec.js +++ b/modules/angular2/test/directives/if_spec.js @@ -23,7 +23,7 @@ import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_str import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {Component} from 'angular2/src/core/annotations/annotations'; diff --git a/modules/angular2/test/directives/non_bindable_spec.js b/modules/angular2/test/directives/non_bindable_spec.js index 52e37677ee..68e5d587d7 100644 --- a/modules/angular2/test/directives/non_bindable_spec.js +++ b/modules/angular2/test/directives/non_bindable_spec.js @@ -19,7 +19,7 @@ import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_meta import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; diff --git a/modules/angular2/test/directives/switch_spec.js b/modules/angular2/test/directives/switch_spec.js index 6da34853b3..8f178d9fcd 100644 --- a/modules/angular2/test/directives/switch_spec.js +++ b/modules/angular2/test/directives/switch_spec.js @@ -19,7 +19,7 @@ import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_meta import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {Component} from 'angular2/src/core/annotations/annotations'; diff --git a/modules/angular2/test/forms/integration_spec.js b/modules/angular2/test/forms/integration_spec.js index 6d1689affa..d19d6293fb 100644 --- a/modules/angular2/test/forms/integration_spec.js +++ b/modules/angular2/test/forms/integration_spec.js @@ -22,7 +22,7 @@ import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_str import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager'; import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone'; diff --git a/modules/angular2/test/core/compiler/property_setter_factory_spec.js b/modules/angular2/test/render/dom/compiler/property_setter_factory_spec.js similarity index 96% rename from modules/angular2/test/core/compiler/property_setter_factory_spec.js rename to modules/angular2/test/render/dom/compiler/property_setter_factory_spec.js index b021100eb7..e99d6ba815 100644 --- a/modules/angular2/test/core/compiler/property_setter_factory_spec.js +++ b/modules/angular2/test/render/dom/compiler/property_setter_factory_spec.js @@ -1,5 +1,5 @@ import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach, el} from 'angular2/test_lib'; -import {setterFactory} from 'angular2/src/core/compiler/property_setter_factory'; +import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory'; import {DOM} from 'angular2/src/dom/dom_adapter'; export function main() { @@ -8,7 +8,7 @@ export function main() { div = el('
'); }); describe('property setter factory', () => { - + it('should return a setter for a property', () => { var setterFn = setterFactory('title'); setterFn(div, 'Hello'); diff --git a/modules/angular2/test/core/compiler/selector_spec.js b/modules/angular2/test/render/dom/compiler/selector_spec.js similarity index 98% rename from modules/angular2/test/core/compiler/selector_spec.js rename to modules/angular2/test/render/dom/compiler/selector_spec.js index f9d54653b8..b0a0555cf4 100644 --- a/modules/angular2/test/core/compiler/selector_spec.js +++ b/modules/angular2/test/render/dom/compiler/selector_spec.js @@ -1,7 +1,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; import {DOM} from 'angular2/src/dom/dom_adapter'; -import {SelectorMatcher} from 'angular2/src/core/compiler/selector'; -import {CssSelector} from 'angular2/src/core/compiler/selector'; +import {SelectorMatcher} from 'angular2/src/render/dom/compiler/selector'; +import {CssSelector} from 'angular2/src/render/dom/compiler/selector'; import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; export function main() { diff --git a/modules/angular2/test/core/compiler/style_inliner_spec.js b/modules/angular2/test/render/dom/shadow_dom/style_inliner_spec.js similarity index 98% rename from modules/angular2/test/core/compiler/style_inliner_spec.js rename to modules/angular2/test/render/dom/shadow_dom/style_inliner_spec.js index 5e016e265e..28ed95e312 100644 --- a/modules/angular2/test/core/compiler/style_inliner_spec.js +++ b/modules/angular2/test/render/dom/shadow_dom/style_inliner_spec.js @@ -11,7 +11,7 @@ import { it, xit, } from 'angular2/test_lib'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {isBlank} from 'angular2/src/facade/lang'; import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; diff --git a/modules/angular2/test/core/compiler/style_url_resolver_spec.js b/modules/angular2/test/render/dom/shadow_dom/style_url_resolver_spec.js similarity index 96% rename from modules/angular2/test/core/compiler/style_url_resolver_spec.js rename to modules/angular2/test/render/dom/shadow_dom/style_url_resolver_spec.js index 68d2096543..9d43bc49a2 100644 --- a/modules/angular2/test/core/compiler/style_url_resolver_spec.js +++ b/modules/angular2/test/render/dom/shadow_dom/style_url_resolver_spec.js @@ -1,5 +1,5 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {UrlResolver} from 'angular2/src/services/url_resolver'; diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.js b/modules/benchmarks/src/compiler/compiler_benchmark.js index 3c701a87c8..f7430dc896 100644 --- a/modules/benchmarks/src/compiler/compiler_benchmark.js +++ b/modules/benchmarks/src/compiler/compiler_benchmark.js @@ -17,7 +17,7 @@ import {Template} from 'angular2/src/core/annotations/template'; import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; diff --git a/modules/benchmarks/src/compiler/selector_benchmark.js b/modules/benchmarks/src/compiler/selector_benchmark.js index cdcccff7a0..ebf3664f03 100644 --- a/modules/benchmarks/src/compiler/selector_benchmark.js +++ b/modules/benchmarks/src/compiler/selector_benchmark.js @@ -1,5 +1,5 @@ -import {SelectorMatcher} from "angular2/src/core/compiler/selector"; -import {CssSelector} from "angular2/src/core/compiler/selector"; +import {SelectorMatcher} from "angular2/src/render/dom/compiler/selector"; +import {CssSelector} from "angular2/src/render/dom/compiler/selector"; import {StringWrapper, Math} from 'angular2/src/facade/lang'; import {ListWrapper} from 'angular2/src/facade/collection'; import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.js b/modules/benchmarks/src/largetable/largetable_benchmark.js index 59b87647ee..ecac179ce1 100644 --- a/modules/benchmarks/src/largetable/largetable_benchmark.js +++ b/modules/benchmarks/src/largetable/largetable_benchmark.js @@ -13,9 +13,9 @@ import {Content} from 'angular2/src/core/compiler/shadow_dom_emulation/content_t import {DestinationLightDom} from 'angular2/src/core/compiler/shadow_dom_emulation/light_dom'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader'; import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability'; diff --git a/modules/benchmarks/src/naive_infinite_scroll/index.js b/modules/benchmarks/src/naive_infinite_scroll/index.js index c5bf48afee..7d045a1c6f 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/index.js +++ b/modules/benchmarks/src/naive_infinite_scroll/index.js @@ -20,9 +20,9 @@ import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; import {XHR} from 'angular2/src/services/xhr'; import {XHRImpl} from 'angular2/src/services/xhr_impl'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader'; import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability'; diff --git a/modules/benchmarks/src/tree/tree_benchmark.js b/modules/benchmarks/src/tree/tree_benchmark.js index c9ea41f571..5758cb8eef 100644 --- a/modules/benchmarks/src/tree/tree_benchmark.js +++ b/modules/benchmarks/src/tree/tree_benchmark.js @@ -13,9 +13,9 @@ import {Content} from 'angular2/src/core/compiler/shadow_dom_emulation/content_t import {DestinationLightDom} from 'angular2/src/core/compiler/shadow_dom_emulation/light_dom'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader'; import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability'; diff --git a/modules/examples/src/hello_world/index_static.js b/modules/examples/src/hello_world/index_static.js index 277e41f14e..dedf3d1434 100644 --- a/modules/examples/src/hello_world/index_static.js +++ b/modules/examples/src/hello_world/index_static.js @@ -15,9 +15,9 @@ import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver'; import {XHR} from 'angular2/src/services/xhr'; import {XHRImpl} from 'angular2/src/services/xhr_impl'; import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {StyleInliner} from 'angular2/src/core/compiler/style_inliner'; +import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner'; import {CssProcessor} from 'angular2/src/core/compiler/css_processor'; import {EventManager} from 'angular2/src/render/dom/events/event_manager'; import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader';