Skip to content

Commit c1aa652

Browse files
committed
refactor(render): move services to render folder
property_setter_factory selector style_inliner style_url_resolver shadow_css
1 parent be5ccf6 commit c1aa652

34 files changed

+49
-166
lines changed

modules/angular2/src/core/application.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import {HammerGesturesPlugin} from 'angular2/src/render/dom/events/hammer_gestur
2222
import {Binding} from 'angular2/src/di/binding';
2323
import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
2424
import {UrlResolver} from 'angular2/src/services/url_resolver';
25-
import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver';
26-
import {StyleInliner} from 'angular2/src/core/compiler/style_inliner';
25+
import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver';
26+
import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner';
2727
import {CssProcessor} from 'angular2/src/core/compiler/css_processor';
2828
import {Component} from 'angular2/src/core/annotations/annotations';
2929
import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader';

modules/angular2/src/core/compiler/element_injector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {NgElement} from 'angular2/src/core/dom/element';
1010
import {Directive, onChange, onDestroy, onAllChangesDone} from 'angular2/src/core/annotations/annotations';
1111
import {BindingPropagationConfig} from 'angular2/change_detection';
1212
import * as pclModule from 'angular2/src/core/compiler/private_component_location';
13-
import {setterFactory} from './property_setter_factory';
13+
import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory';
1414

1515
var _MAX_DIRECTIVE_CONSTRUCTION_COUNTER = 10;
1616

modules/angular2/src/core/compiler/pipeline/directive_parser.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import {isPresent, isBlank, BaseException, assertionsEnabled, RegExpWrapper} from 'angular2/src/facade/lang';
22
import {List, MapWrapper} from 'angular2/src/facade/collection';
33
import {DOM} from 'angular2/src/dom/dom_adapter';
4-
import {SelectorMatcher} from '../selector';
5-
import {CssSelector} from '../selector';
4+
import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector';
65

76
import {DirectiveMetadata} from '../directive_metadata';
87
import {DynamicComponent, Component, Viewport} from '../../annotations/annotations';

modules/angular2/src/core/compiler/pipeline/element_binder_builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {CompileStep} from './compile_step';
1111
import {CompileElement} from './compile_element';
1212
import {CompileControl} from './compile_control';
1313
import {dashCaseToCamelCase} from '../string_utils';
14-
import {setterFactory} from '../property_setter_factory'
14+
import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory'
1515

1616
/**
1717
* Creates the ElementBinders and adds watches to the

modules/angular2/src/core/compiler/shadow_dom_strategy.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import {DOM} from 'angular2/src/dom/dom_adapter';
88
import * as viewModule from './view';
99

1010
import {LightDom} from './shadow_dom_emulation/light_dom';
11-
import {ShadowCss} from './shadow_dom_emulation/shadow_css';
11+
import {ShadowCss} from 'angular2/src/render/dom/shadow_dom/shadow_css';
1212

13-
import {StyleInliner} from './style_inliner';
14-
import {StyleUrlResolver} from './style_url_resolver';
13+
import {StyleInliner} from 'angular2/src/render/dom/shadow_dom/style_inliner';
14+
import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver';
1515

1616
import {DirectiveMetadata} from './directive_metadata';
1717

@@ -105,7 +105,7 @@ export class EmulatedUnscopedShadowDomStrategy extends ShadowDomStrategy {
105105

106106
getTemplateCompileStep(cmpMetadata: DirectiveMetadata): NS.CompileStep {
107107
return new _BaseEmulatedShadowDomStep();
108-
}
108+
}
109109
}
110110

111111
/**
@@ -190,7 +190,7 @@ class _BaseEmulatedShadowDomStep extends NS.CompileStep {
190190
DOM.remove(current.element);
191191

192192
current.element = contentStart;
193-
}
193+
}
194194
}
195195

196196
}

modules/angular2/src/dom/parse5_adapter.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var url = require('url');
1010
import {List, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
1111
import {DomAdapter, setRootDomAdapter} from './dom_adapter';
1212
import {BaseException, isPresent, isBlank} from 'angular2/src/facade/lang';
13-
import {SelectorMatcher, CssSelector} from 'angular2/src/core/compiler/selector';
13+
import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector';
1414

1515
var _attrToPropMap = {
1616
'innerHtml': 'innerHTML',

modules/angular2/src/render/dom/compiler/directive_parser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
33
import {DOM} from 'angular2/src/dom/dom_adapter';
44
import {Parser} from 'angular2/change_detection';
55

6-
import {SelectorMatcher, CssSelector} from './selector';
6+
import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector';
77

88
import {CompileStep} from './compile_step';
99
import {CompileElement} from './compile_element';
1010
import {CompileControl} from './compile_control';
1111

12-
import {setterFactory} from './property_setter_factory';
12+
import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory';
1313

1414
import {DirectiveMetadata} from '../../api';
1515
import {dashCaseToCamelCase, camelCaseToDashCase} from '../util';

modules/angular2/src/render/dom/compiler/property_binding_parser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {CompileElement} from './compile_element';
88
import {CompileControl} from './compile_control';
99

1010
import {dashCaseToCamelCase} from '../util';
11-
import {setterFactory} from './property_setter_factory';
11+
import {setterFactory} from 'angular2/src/render/dom/compiler/property_setter_factory';
1212

1313
// Group 1 = "bind-"
1414
// Group 2 = "var-" or "#"

modules/angular2/src/core/compiler/property_setter_factory.js renamed to modules/angular2/src/render/dom/compiler/property_setter_factory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {StringWrapper, RegExpWrapper, BaseException, isPresent, isBlank, isString, stringify} from 'angular2/src/facade/lang';
22
import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
33
import {DOM} from 'angular2/src/dom/dom_adapter';
4-
import {camelCaseToDashCase, dashCaseToCamelCase} from './string_utils';
4+
import {camelCaseToDashCase, dashCaseToCamelCase} from '../util';
55
import {reflector} from 'angular2/src/reflection/reflection';
66

77
const STYLE_SEPARATOR = '.';
File renamed without changes.

0 commit comments

Comments
 (0)