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

fix(compiler): treat custom elements as unknown elements by default 

Closes #10300
This commit is contained in:
Tobias Bosch 2016-07-26 11:25:38 -07:00
parent 482c019199
commit fc83bbbe98
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/@angular/compiler/src/schema/dom_element_schema_registry.ts
View File

@ -271,23 +271,21 @@ export class DomElementSchemaRegistry extends ElementSchemaRegistry {
} }
hasProperty(tagName: string, propName: string, schemaMetas: SchemaMetadata[]): boolean { hasProperty(tagName: string, propName: string, schemaMetas: SchemaMetadata[]): boolean {
const hasCustomElementSchema =
schemaMetas.some((schema) => schema.name === CUSTOM_ELEMENTS_SCHEMA.name);
if (tagName.indexOf('-') !== -1) { if (tagName.indexOf('-') !== -1) {
if (tagName === 'ng-container' || tagName === 'ng-content') { if (tagName === 'ng-container' || tagName === 'ng-content') {
return false; return false;
} }
if (schemaMetas.some((schema) => schema.name === CUSTOM_ELEMENTS_SCHEMA.name)) {
// Can't tell now as we don't know which properties a custom element will get // Can't tell now as we don't know which properties a custom element will get
// once it is instantiated // once it is instantiated
return hasCustomElementSchema; return true;
} else {
var elementProperties = this.schema[tagName.toLowerCase()];
if (!isPresent(elementProperties)) {
elementProperties = this.schema['unknown'];
} }
return isPresent(elementProperties[propName]);
} }
var elementProperties = this.schema[tagName.toLowerCase()];
if (!isPresent(elementProperties)) {
elementProperties = this.schema['unknown'];
}
return isPresent(elementProperties[propName]);
} }
/** /**

8
modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
View File

@ -47,8 +47,12 @@ export function main() {
expect(registry.hasProperty('video', 'click', [])).toBeFalsy(); expect(registry.hasProperty('video', 'click', [])).toBeFalsy();
}); });
it('should return false for custom-like elements by default', it('should treat custom elements as an unknown element by default', () => {
() => { expect(registry.hasProperty('custom-like', 'unknown', [])).toBe(false); }); expect(registry.hasProperty('custom-like', 'unknown', [])).toBe(false);
expect(registry.hasProperty('custom-like', 'className', [])).toBeTruthy();
expect(registry.hasProperty('custom-like', 'style', [])).toBeTruthy();
expect(registry.hasProperty('custom-like', 'id', [])).toBeTruthy();
});
it('should return true for custom-like elements if the CUSTOM_ELEMENTS_SCHEMA was used', () => { it('should return true for custom-like elements if the CUSTOM_ELEMENTS_SCHEMA was used', () => {
expect(registry.hasProperty('custom-like', 'unknown', [CUSTOM_ELEMENTS_SCHEMA])).toBeTruthy(); expect(registry.hasProperty('custom-like', 'unknown', [CUSTOM_ELEMENTS_SCHEMA])).toBeTruthy();