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

fix(style_compiler): don’t resolve absolute urls that start with a `/` during compilation 

Closes #4763
This commit is contained in:
Tobias Bosch 2015-10-15 10:17:14 -07:00
parent cec8b58373
commit a941fb08f7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/angular2/src/core/compiler/style_url_resolver.ts
View File

@ -15,7 +15,7 @@ export class StyleWithImports {
}
export function isStyleUrlResolvable(url: string): boolean {
if (isBlank(url) || url.length === 0) return false;
if (isBlank(url) || url.length === 0 || url[0] == '/') return false;
var schemeMatch = RegExpWrapper.firstMatch(_urlWithSchemaRe, url);
return isBlank(schemeMatch) || schemeMatch[1] == 'package';
}
@ -42,4 +42,4 @@ export function extractStyleUrls(resolver: UrlResolver, baseUrl: string, cssText
var _cssImportRe = /@import\s+(?:url\()?\s*(?:(?:['"]([^'"]*))|([^;\)\s]*))[^;]*;?/g;
// TODO: can't use /^[^:/?#.]+:/g due to clang-format bug:
// https://github.com/angular/angular/issues/4596
var _urlWithSchemaRe = /^['"]?([a-zA-Z\-\+\.]+):/g;
var _urlWithSchemaRe = /^([a-zA-Z\-\+\.]+):/g;

5
modules/angular2/test/core/compiler/style_url_resolver_spec.ts
View File

@ -96,6 +96,11 @@ 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);
});
});
}