honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(compiler): allow absolute style urls (#14365) 

Closes #4974

PR Close #14365
This commit is contained in:
Dzmitry Shylovich 2017-02-09 00:18:01 +03:00 committed by Miško Hevery
parent a696f4aade
commit 6b9aa2ca3d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/compiler/src/style_url_resolver.ts
View File

@ -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';
}

6
modules/@angular/compiler/test/style_url_resolver_spec.ts
View File

@ -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);
});
});
}