From 6b9aa2ca3dd6cacb8c010406596f715eec6fddbd Mon Sep 17 00:00:00 2001 From: Dzmitry Shylovich Date: Thu, 9 Feb 2017 00:18:01 +0300 Subject: [PATCH] fix(compiler): allow absolute style urls (#14365) Closes #4974 PR Close #14365 --- modules/@angular/compiler/src/style_url_resolver.ts | 2 +- modules/@angular/compiler/test/style_url_resolver_spec.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/@angular/compiler/src/style_url_resolver.ts b/modules/@angular/compiler/src/style_url_resolver.ts index 1f2bbb5dd6..c9d43c7bb6 100644 --- a/modules/@angular/compiler/src/style_url_resolver.ts +++ b/modules/@angular/compiler/src/style_url_resolver.ts @@ -16,7 +16,7 @@ export class StyleWithImports { } export function isStyleUrlResolvable(url: string): boolean { - if (url == null || url.length === 0 || url[0] == '/') return false; + if (!url) return false; const schemeMatch = url.match(URL_WITH_SCHEMA_REGEXP); return schemeMatch === null || schemeMatch[1] == 'package' || schemeMatch[1] == 'asset'; } diff --git a/modules/@angular/compiler/test/style_url_resolver_spec.ts b/modules/@angular/compiler/test/style_url_resolver_spec.ts index 819ad7d0a6..94315261fa 100644 --- a/modules/@angular/compiler/test/style_url_resolver_spec.ts +++ b/modules/@angular/compiler/test/style_url_resolver_spec.ts @@ -110,9 +110,9 @@ export function main() { it('should not resolve urls with other schema', () => { expect(isStyleUrlResolvable('http://otherurl')).toBe(false); }); - it('should not resolve urls with absolute paths', () => { - expect(isStyleUrlResolvable('/otherurl')).toBe(false); - expect(isStyleUrlResolvable('//otherurl')).toBe(false); + it('should resolve urls with absolute paths', () => { + expect(isStyleUrlResolvable('/otherurl')).toBe(true); + expect(isStyleUrlResolvable('//otherurl')).toBe(true); }); }); }