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

fix(ShadowCss): support `[attr="value with space"]` 

fixes #6249
This commit is contained in:
Victor Berchet 2016-09-26 09:55:05 -07:00 committed by Chuck Jazdzewski
parent f7bfda31ff
commit 6c4ec05a4a
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/@angular/compiler/src/shadow_css.ts
View File

@ -417,21 +417,35 @@ export class ShadowCss {
return scopedP; return scopedP;
}; };
const sep = /( |>|\+|~(?!=))\s*/g; const sep = /( |>|\+|~(?!=)|\[|\])\s*/g;
const scopeAfter = selector.indexOf(_polyfillHostNoCombinator); const scopeAfter = selector.indexOf(_polyfillHostNoCombinator);
let scoped = ''; let scoped = '';
let startIndex = 0; let startIndex = 0;
let res: RegExpExecArray; let res: RegExpExecArray;
let inAttributeSelector: boolean = false;
while ((res = sep.exec(selector)) !== null) { while ((res = sep.exec(selector)) !== null) {
const separator = res[1]; const separator = res[1];
const part = selector.slice(startIndex, res.index).trim(); if (separator === '[') {
// if a selector appears before :host-context it should not be shimmed as it inAttributeSelector = true;
// matches on ancestor elements and not on elements in the host's shadow scoped += selector.slice(startIndex, res.index).trim() + '[';
const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part; startIndex = sep.lastIndex;
scoped += `${scopedPart} ${separator} `; }
startIndex = sep.lastIndex; if (!inAttributeSelector) {
const part = selector.slice(startIndex, res.index).trim();
// if a selector appears before :host-context it should not be shimmed as it
// matches on ancestor elements and not on elements in the host's shadow
const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part;
scoped += `${scopedPart} ${separator} `;
startIndex = sep.lastIndex;
} else if (separator === ']') {
const part = selector.slice(startIndex, res.index).trim() + ']';
const scopedPart = startIndex >= scopeAfter ? _scopeSelectorPart(part) : part;
scoped += `${scopedPart} `;
startIndex = sep.lastIndex;
inAttributeSelector = false;
}
} }
return scoped + _scopeSelectorPart(selector.substring(startIndex)); return scoped + _scopeSelectorPart(selector.substring(startIndex));
} }

1
modules/@angular/compiler/test/shadow_css_spec.ts
View File

@ -91,6 +91,7 @@ export function main() {
expect(s('one[attr*="value"] {}', 'a')).toEqual('one[attr*="value"][a] {}'); expect(s('one[attr*="value"] {}', 'a')).toEqual('one[attr*="value"][a] {}');
expect(s('one[attr|="value"] {}', 'a')).toEqual('one[attr|="value"][a] {}'); expect(s('one[attr|="value"] {}', 'a')).toEqual('one[attr|="value"][a] {}');
expect(s('one[attr~="value"] {}', 'a')).toEqual('one[attr~="value"][a] {}'); expect(s('one[attr~="value"] {}', 'a')).toEqual('one[attr~="value"][a] {}');
expect(s('one[attr="va lue"] {}', 'a')).toEqual('one[attr="va lue"][a] {}');
expect(s('one[attr] {}', 'a')).toEqual('one[attr][a] {}'); expect(s('one[attr] {}', 'a')).toEqual('one[attr][a] {}');
expect(s('[is="one"] {}', 'a')).toEqual('[is="one"][a] {}'); expect(s('[is="one"] {}', 'a')).toEqual('[is="one"][a] {}');
}); });