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

Merge pull request #1189 from NativeScript/cankov/codeless-fragments-events

Browse Source 
XML fragments without code not getting context from parent
This commit is contained in:
Panayot Cankov
2015-12-03 10:24:36 +02:00
parent f8fb30577c e5ec759cbb
commit c07751a419
6 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment-the-fragment.xml Normal file
View File

@ -0,0 +1,5 @@
<tc:TemplateView id="template-view" xmlns:tc="xml-declaration/template-builder-tests/template-view">
<tc:TemplateView.template>
<tc:TemplateView text="Click!" test="test" />
</tc:TemplateView.template>
</tc:TemplateView>

2
apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment.ts Normal file
View File

@ -0,0 +1,2 @@
// Our unit test will set this function and expect it to be set as a handler on a View in the XML.
export var test: (args: any) => void;

4
apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment.xml Normal file
View File

@ -0,0 +1,4 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd"
xmlns:fragment="xml-declaration/template-builder-tests">
<fragment:event-in-codeless-fragment-the-fragment />
</Page>

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

@ -893,5 +893,31 @@ export function test_EventInTemplate() {
object: childTemplateView
});
TKUnit.assert(notified, "Expected the child to raise the test event.");
}
export function test_EventInCodelessFragment() {
var pageCode = require("./template-builder-tests/event-in-codeless-fragment");
var notified = false;
pageCode.test = (args) => {
notified = true;
}
var basePath = "xml-declaration/";
var message;
var page = builder.load(__dirname + "/template-builder-tests/event-in-codeless-fragment.xml", pageCode);
TKUnit.assert(view, "Expected the xml to generate a page");
var templateView = <TemplateView>page.getViewById("template-view");
TKUnit.assert(templateView, "Expected the page to have a TemplateView with 'temaplte-view' id.");
templateView.parseTemplate();
TKUnit.assertEqual(templateView.getChildrenCount(), 1, "Expected TemplateView initially to have 1 child.");
var childTemplateView = <TemplateView>templateView.getChildAt(0);
TKUnit.assert(childTemplateView, "Expected the TemplateView's template to create a child TemplateView.");
childTemplateView.notify({
eventName: "test",
object: childTemplateView
});
TKUnit.assert(notified, "Expected the child to raise the test event.");
}

3
tsconfig.json
View File

@ -319,8 +319,9 @@
"apps/tests/xml-declaration/mainPage.ts",
"apps/tests/xml-declaration/mymodule/MyControl.ts",
"apps/tests/xml-declaration/mymodulewithxml/MyControl.ts",
"apps/tests/xml-declaration/template-builder-tests/event-in-template.ts",
"apps/tests/xml-declaration/template-builder-tests/template-view.ts",
"apps/tests/xml-declaration/template-builder-tests/event-in-template.ts",
"apps/tests/xml-declaration/template-builder-tests/event-in-codeless-fragment.ts",
"apps/tests/xml-declaration/xml-declaration-tests.ts",
"apps/tests/xml-parser-tests/xml-parser-tests.ts",
"apps/transforms/app.ts",

2
ui/builder/builder.ts
View File

@ -63,7 +63,7 @@ function loadCustomComponent(componentPath: string, componentName?: string, attr
// Custom components with XML
var jsFilePath = fileResolverModule.resolveFileName(fullComponentPathFilePathWithoutExt, "js");
var subExports;
var subExports = context;
if (jsFilePath) {
// Custom components with XML and code
subExports = require(jsFilePath)