Skip to content

Commit c8845d0

Browse files
committed
removed the need for css_processor
1 parent 0424ea0 commit c8845d0

File tree

4 files changed

+405
-416
lines changed

4 files changed

+405
-416
lines changed

modules/angular2/src/render/shadow_dom/css_processor.js

Lines changed: 0 additions & 70 deletions
This file was deleted.

modules/angular2/src/render/shadow_dom/shadow_dom_strategy.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export class ShadowDomStrategy {
3737
* An optional step that can modify the template style elements.
3838
*
3939
* @param {Template} template
40+
* @param {List<Promise>} stylePromises
4041
* @returns {CompileStep} a compile step to append to the compiler pipeline
4142
*/
4243
getStyleCompileStep(template: Template, stylePromises: List<Promise>): NS.CompileStep {
@@ -205,7 +206,19 @@ class _ShimShadowDomStep extends _BaseEmulatedShadowDomStep {
205206
}
206207
}
207208

208-
class _EmulatedUnscopedCssStep extends NS.CompileStep {
209+
class _CssProcessorStep extends NS.CompileStep {
210+
process(parent:CompileElement, current:CompileElement, control:CompileControl) {
211+
if (DOM.tagName(current.element) == 'STYLE') {
212+
current.ignoreBindings = true;
213+
this.processStyleElement(current.element);
214+
}
215+
}
216+
217+
processStyleElement(styleEl) {}
218+
}
219+
220+
221+
class _EmulatedUnscopedCssStep extends _CssProcessorStep {
209222
_templateUrl: string;
210223
_styleUrlResolver: StyleUrlResolver;
211224
_styleHost;
@@ -217,8 +230,7 @@ class _EmulatedUnscopedCssStep extends NS.CompileStep {
217230
this._styleHost = styleHost;
218231
}
219232

220-
process(parent:CompileElement, current:CompileElement, control:CompileControl) {
221-
var styleEl = current.element;
233+
processStyleElement(styleEl) {
222234
var cssText = DOM.getText(styleEl);
223235
cssText = this._styleUrlResolver.resolveUrls(cssText, this._templateUrl);
224236
DOM.setText(styleEl, cssText);
@@ -233,7 +245,7 @@ class _EmulatedUnscopedCssStep extends NS.CompileStep {
233245
}
234246
}
235247

236-
class _EmulatedScopedCssStep extends NS.CompileStep {
248+
class _EmulatedScopedCssStep extends _CssProcessorStep {
237249
_templateUrl: string;
238250
_template: Template;
239251
_styleInliner: StyleInliner;
@@ -251,9 +263,7 @@ class _EmulatedScopedCssStep extends NS.CompileStep {
251263
this._stylePromises = stylePromises;
252264
}
253265

254-
process(parent:CompileElement, current:CompileElement, control:CompileControl) {
255-
var styleEl = current.element;
256-
266+
processStyleElement(styleEl) {
257267
var cssText = DOM.getText(styleEl);
258268

259269
cssText = this._styleUrlResolver.resolveUrls(cssText, this._template.absUrl);
@@ -276,7 +286,7 @@ class _EmulatedScopedCssStep extends NS.CompileStep {
276286
}
277287
}
278288

279-
class _NativeCssStep extends NS.CompileStep {
289+
class _NativeCssStep extends _CssProcessorStep {
280290
_styleUrlResolver: StyleUrlResolver;
281291
_templateUrl: string;
282292

@@ -286,8 +296,7 @@ class _NativeCssStep extends NS.CompileStep {
286296
this._templateUrl = templateUrl;
287297
}
288298

289-
process(parent:CompileElement, current:CompileElement, control:CompileControl) {
290-
var styleEl = current.element;
299+
processStyleElement(styleEl) {
291300
var cssText = DOM.getText(styleEl);
292301
cssText = this._styleUrlResolver.resolveUrls(cssText, this._templateUrl);
293302
DOM.setText(styleEl, cssText);

0 commit comments

Comments
 (0)