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

fileName change to path and componentName changed to name

Browse Source
This commit is contained in:
Vladimir Enchev
2015-07-07 15:36:20 +03:00
parent 3aa8c04929
commit 09d289131e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,8 @@ export function test_load_ShouldNotCrashWithoutExports() {
export function test_loadWithOptionsNoXML() { export function test_loadWithOptionsNoXML() {
var v = builder.load({ var v = builder.load({
fileName: "~/xml-declaration/mymodule", path: "~/xml-declaration/mymodule",
componentName: "MyControl", name: "MyControl",
exports: exports exports: exports
}); });
@ -52,8 +52,8 @@ export function test_loadWithOptionsNoXML() {
export function test_loadWithOptionsWithXML() { export function test_loadWithOptionsWithXML() {
var v = builder.load({ var v = builder.load({
fileName: "~/xml-declaration/mymodulewithxml", path: "~/xml-declaration/mymodulewithxml",
componentName: "MyControl", name: "MyControl",
exports: exports exports: exports
}); });
TKUnit.assert(v instanceof view.View, "Expected result: View; Actual result: " + v + ";"); TKUnit.assert(v instanceof view.View, "Expected result: View; Actual result: " + v + ";");
@ -61,8 +61,8 @@ export function test_loadWithOptionsWithXML() {
export function test_loadWithOptionsFromTNS() { export function test_loadWithOptionsFromTNS() {
var v = builder.load({ var v = builder.load({
fileName: "ui/label", path: "ui/label",
componentName: "Label" name: "Label"
}); });
TKUnit.assert(v instanceof labelModule.Label, "Expected result: Label; Actual result: " + v + ";"); TKUnit.assert(v instanceof labelModule.Label, "Expected result: Label; Actual result: " + v + ";");
@ -70,8 +70,8 @@ export function test_loadWithOptionsFromTNS() {
export function test_loadWithOptionsFromTNSPath() { export function test_loadWithOptionsFromTNSPath() {
var v = builder.load({ var v = builder.load({
fileName: "tns_modules/ui/label", path: "tns_modules/ui/label",
componentName: "Label" name: "Label"
}); });
TKUnit.assert(v instanceof labelModule.Label, "Expected result: Label; Actual result: " + v + ";"); TKUnit.assert(v instanceof labelModule.Label, "Expected result: Label; Actual result: " + v + ";");

4
ui/builder/builder.d.ts vendored
View File

@ -7,8 +7,8 @@ declare module "ui/builder" {
export function parse(value: string, exports?: any): view.View; export function parse(value: string, exports?: any): view.View;
export interface LoadOptions { export interface LoadOptions {
fileName: string; path: string;
componentName: string; name: string;
exports?: any; exports?: any;
} }
} }

2
ui/builder/builder.ts
View File

@ -227,7 +227,7 @@ export function load(arg: any): view.View {
if (arguments.length === 1) { if (arguments.length === 1) {
if (!types.isString(arguments[0])) { if (!types.isString(arguments[0])) {
var options = <definition.LoadOptions>arguments[0]; var options = <definition.LoadOptions>arguments[0];
componentModule = loadCustomComponent(options.fileName, options.componentName, undefined, options.exports); componentModule = loadCustomComponent(options.path, options.name, undefined, options.exports);
} else { } else {
componentModule = loadInternal(<string>arguments[0]); componentModule = loadInternal(<string>arguments[0]);
} }