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

Fix applying app CSS to template children when using custom pages.

Browse Source 
No longer using getAncestor(view, "Page") to look for a pagey parent.
Replaced that with a View.page property. Removed getAncestor as its type
name-based implementation seems unreliable.
This commit is contained in:
Hristo Deshev
2015-08-05 14:57:39 +03:00
parent ea627a8c26
commit 141668bb05
15 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/tests/pages/background-test.ts
View File

@@ -2,12 +2,12 @@ import view = require("ui/core/view");
import pages = require("ui/page");
export function applyTap(args) {
var page = <pages.Page>view.getAncestor(args.object, "Page");
var page = <pages.Page>(<view.View>args.object).page;
var css = "#test-element { " + args.object.tag + " }";
page.css = css;
}
export function resetTap(args) {
var page = <pages.Page>view.getAncestor(args.object, "Page");
var page = <pages.Page>(<view.View>args.object).page;
page.css = "";
}
}

4
apps/tests/xml-declaration/inherited-base-page.ts Normal file
View File

@@ -0,0 +1,4 @@
import {Page} from "ui/page";
export class InheritedPage extends Page {
}

7
apps/tests/xml-declaration/inherited-page.ts Normal file
View File

@@ -0,0 +1,7 @@
import {Page} from "ui/page";
import {Label} from "ui/label";
export function pageLoaded(args) {
var page = <Page>args.object;
(<Label>page.content).text += " and loaded";
}

4
apps/tests/xml-declaration/inherited-page.xml Normal file
View File

@@ -0,0 +1,4 @@
<inherited:InheritedPage xmlns="http://www.nativescript.org/tns.xsd"
xmlns:inherited="xml-declaration/inherited-base-page" loaded="pageLoaded">
<Label text="Inherited" />
</inherited:InheritedPage>

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

@@ -12,7 +12,7 @@ import fs = require("file-system");
import fileSystemAccess = require("file-system/file-system-access");
import observable = require("data/observable");
import stackLayoutModule = require("ui/layouts/stack-layout");
import labelModule = require("ui/label");
import {Label} from "ui/label";
import myCustomControlWithoutXml = require("./mymodule/MyControl");
import listViewModule = require("ui/list-view");
import helper = require("../ui/helper");
@@ -76,6 +76,16 @@ export function test_loadWithOptionsNoXML_CSSIsApplied() {
}
};
export function test_loadInheritedPageAndResolveFromChild() {
helper.navigateToModuleAndRunTest("./xml-declaration/inherited-page", null, (page) => {
let contentLabel = <Label>page.content;
TKUnit.assertEqual("Inherited and loaded", contentLabel.text);
let discoveredPage = contentLabel.page;
TKUnit.assert(page === discoveredPage);
});
}
export function test_loadWithOptionsWithXML() {
var v = builder.load({
path: "~/xml-declaration/mymodulewithxml",
@@ -116,7 +126,7 @@ export function test_loadWithOptionsFromTNS() {
name: "Label"
});
TKUnit.assert(v instanceof labelModule.Label, "Expected result: Label; Actual result: " + v + ";");
TKUnit.assert(v instanceof Label, "Expected result: Label; Actual result: " + v + ";");
};
export function test_loadWithOptionsFromTNSPath() {
@@ -125,7 +135,7 @@ export function test_loadWithOptionsFromTNSPath() {
name: "Label"
});
TKUnit.assert(v instanceof labelModule.Label, "Expected result: Label; Actual result: " + v + ";");
TKUnit.assert(v instanceof Label, "Expected result: Label; Actual result: " + v + ";");
};
export function test_parse_ShouldNotCrashWithoutExports() {
@@ -236,7 +246,7 @@ export function test_parse_ShouldParsePlatformSpecificComponents() {
TKUnit.assert(p.content instanceof textFieldModule.TextField, "Expected result: TextField; Actual result: " + p.content);
}
else {
TKUnit.assert(p.content instanceof labelModule.Label, "Expected result: Label; Actual result: " + p.content);
TKUnit.assert(p.content instanceof Label, "Expected result: Label; Actual result: " + p.content);
}
};
@@ -294,7 +304,7 @@ export function test_parse_ShouldParseBindingsToGestures() {
};
p.bindingContext = context;
var lbl = <labelModule.Label>p.content;
var lbl = <Label>p.content;
var observer = (<view.View>lbl).getGestureObservers(gesturesModule.GestureTypes.tap)[0];
@@ -315,11 +325,11 @@ export function test_parse_ShouldParseSubProperties() {
export function test_parse_ShouldParseBindingsWithCommaInsideSingleQuote() {
var expected = "Hi,test"
var bindingString = "{{ 'Hi,' + myProp }}";
var p = <page.Page>builder.parse('<Page><Label text="' + bindingString + '" /></Page>');
var p = <Page>builder.parse('<Page><Label text="' + bindingString + '" /></Page>');
var obj = new observable.Observable();
obj.set("myProp", "test");
p.bindingContext = obj;
var lbl = <labelModule.Label>p.content;
var lbl = <Label>p.content;
TKUnit.assert(lbl.text === expected, "Expected " + expected + "; Actual result: " + lbl.text + "; type: " + typeof (lbl.text));
};
@@ -327,11 +337,11 @@ export function test_parse_ShouldParseBindingsWithCommaInsideSingleQuote() {
export function test_parse_ShouldParseBindingsWithCommaInsideDoubleQuote() {
var expected = "Hi,test"
var bindingString = '{{ "Hi," + myProp }}';
var p = <page.Page>builder.parse("<Page><Label text='" + bindingString + "' /></Page>");
var p = <Page>builder.parse("<Page><Label text='" + bindingString + "' /></Page>");
var obj = new observable.Observable();
obj.set("myProp", "test");
p.bindingContext = obj;
var lbl = <labelModule.Label>p.content;
var lbl = <Label>p.content;
TKUnit.assert(lbl.text === expected, "Expected " + expected + "; Actual result: " + lbl.text + "; type: " + typeof (lbl.text));
};
@@ -352,7 +362,7 @@ export function test_parse_ShouldParseLowerCaseDashedComponentDeclaration() {
var ctrl = <stackLayoutModule.StackLayout>p.content;
TKUnit.assert(ctrl instanceof stackLayoutModule.StackLayout, "Expected result: StackLayout!; Actual result: " + ctrl);
TKUnit.assert(ctrl.getChildAt(0) instanceof labelModule.Label, "Expected result: Label!; Actual result: " + ctrl.getChildAt(0));
TKUnit.assert(ctrl.getChildAt(0) instanceof Label, "Expected result: Label!; Actual result: " + ctrl.getChildAt(0));
TKUnit.assert(ctrl.getChildAt(1) instanceof segmentedBar.SegmentedBar, "Expected result: Label!; Actual result: " + ctrl.getChildAt(0));
};
@@ -367,20 +377,20 @@ export function test_parse_ShouldParseCustomComponentWithoutXmlFromTNSModules()
var p = <page.Page>builder.parse('<Page xmlns' + ':customControls="tns_modules/ui/label"><customControls:Label /></Page>');
var ctrl = p.content;
TKUnit.assert(ctrl instanceof labelModule.Label, "Expected result: custom control is defined!; Actual result: " + ctrl);
TKUnit.assert(ctrl instanceof Label, "Expected result: custom control is defined!; Actual result: " + ctrl);
};
export function test_parse_ShouldParseCustomComponentWithoutXmlFromTNSModulesWhenNotSpecified() {
var p = <page.Page>builder.parse('<Page xmlns' + ':customControls="ui/label"><customControls:Label /></Page>');
var ctrl = p.content;
TKUnit.assert(ctrl instanceof labelModule.Label, "Expected result: custom control is defined!; Actual result: " + ctrl);
TKUnit.assert(ctrl instanceof Label, "Expected result: custom control is defined!; Actual result: " + ctrl);
};
export function test_parse_ShouldParseCustomComponentWithXml() {
var p = <page.Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodulewithxml"><customControls:MyControl /></Page>');
var panel = <stackLayoutModule.StackLayout>p.content;
var lbl = <labelModule.Label>panel.getChildAt(0);
var lbl = <Label>panel.getChildAt(0);
TKUnit.assert(lbl.text === "mymodulewithxml", "Expected result: 'mymodulewithxml'; Actual result: " + lbl);
};
@@ -402,7 +412,7 @@ export function test_parse_ShouldParseCustomComponentWithXml_WithCustomAttribute
export function test_parse_ShouldParseCustomComponentWithXmlNoJS() {
var p = <page.Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodulewithxml"><customControls:my-control-no-js /></Page>');
var panel = <stackLayoutModule.StackLayout>p.content;
var lbl = <labelModule.Label>panel.getChildAt(0);
var lbl = <Label>panel.getChildAt(0);
TKUnit.assertEqual(lbl.text, "I'm all about taht XML, no JS", "label.text");
};
@@ -492,15 +502,15 @@ export function test_parse_NestedRepeaters() {
" </Repeater.itemTemplate>" +
" </Repeater>" +
"</Page>";
var p = <page.Page>builder.parse(pageXML);
var p = <Page>builder.parse(pageXML);
function testAction(views: Array<viewModule.View>) {
p.bindingContext = [["0", "1"], ["2", "3"]];
TKUnit.wait(0.2);
var lbls = new Array<labelModule.Label>();
var lbls = new Array<Label>();
view.eachDescendant(p, (v) => {
if (v instanceof labelModule.Label) {
if (v instanceof Label) {
lbls.push(v);
}
return true;