fix(StyleUrlResolver): add support for media query in import rules

2015-02-26 10:37:25 +01:00
parent 4d8d17ce3d
commit 9f181f39e9
2 changed files with 49 additions and 15 deletions
--- a/modules/angular2/src/core/compiler/style_url_resolver.js
+++ b/modules/angular2/src/core/compiler/style_url_resolver.js
@ -34,6 +34,5 @@ export class StyleUrlResolver {
 }

 var _cssUrlRe = RegExpWrapper.create('(url\\()([^)]*)(\\))');
-// TODO(vicb): handle the media query part
-var _cssImportRe = RegExpWrapper.create('(@import[\\s]+(?!url\\())([^;]*)(;)');
+var _cssImportRe = RegExpWrapper.create('(@import[\\s]+(?!url\\())[\'"]([^\'"]*)[\'"](.*;)');
 var _quoteRe = RegExpWrapper.create('[\'"]');