javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 20:11:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

throw error if nesting platform tags + test

Browse Source
This commit is contained in:
Vladimir Enchev
2015-06-17 16:07:42 +03:00
parent 1c1166d2b3
commit 7c5d1011cb
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/tests/xml-declaration/xml-declaration-tests.ts
View File

@ -152,6 +152,17 @@ export function test_parse_ShouldParsePlatformSpecificComponents() {
} }
}; };
export function test_parse_ThrowErrorWhenNestingPlatforms() {
var e: Error;
try {
builder.parse("<Page><ios><TextField /><android><Label /></android></ios></Page>");
} catch (ex) {
e = ex;
}
TKUnit.assert(e, "Expected result: Error; Actual result: " + e);
};
export function test_parse_ShouldParseBindings() { export function test_parse_ShouldParseBindings() {
var p = <page.Page>builder.parse("<Page><Switch checked='{{ myProp }}' /></Page>"); var p = <page.Page>builder.parse("<Page><Switch checked='{{ myProp }}' /></Page>");
p.bindingContext = { myProp: true }; p.bindingContext = { myProp: true };

13
ui/builder/builder.ts
View File

@ -49,15 +49,16 @@ function parseInternal(value: string, exports: any): componentBuilder.ComponentM
if (args.eventType === xml.ParserEventType.StartElement) { if (args.eventType === xml.ParserEventType.StartElement) {
if (isPlatform(args.elementName)) { if (isPlatform(args.elementName)) {
if (currentPlatformContext) {
throw new Error("Already in '" + currentPlatformContext + "' platform context and cannot switch to '" + args.elementName + "' platform! Platform tags cannot be nested.");
}
currentPlatformContext = args.elementName; currentPlatformContext = args.elementName;
return; return;
} }
} }
if (currentPlatformContext && !isCurentPlatform(currentPlatformContext)) {
return;
}
if (args.eventType === xml.ParserEventType.EndElement) { if (args.eventType === xml.ParserEventType.EndElement) {
if (isPlatform(args.elementName)) { if (isPlatform(args.elementName)) {
currentPlatformContext = undefined; currentPlatformContext = undefined;
@ -65,6 +66,10 @@ function parseInternal(value: string, exports: any): componentBuilder.ComponentM
} }
} }
if (currentPlatformContext && !isCurentPlatform(currentPlatformContext)) {
return;
}
if (templateBuilder) { if (templateBuilder) {
if (args.eventType === xml.ParserEventType.StartElement) { if (args.eventType === xml.ParserEventType.StartElement) {
templateBuilder.addStartElement(args.prefix, args.namespace, args.elementName, args.attributes); templateBuilder.addStartElement(args.prefix, args.namespace, args.elementName, args.attributes);