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

feat(builder): enable reading xml from bundle (#5668)

Browse Source
This commit is contained in:
Martin Yankov
2018-04-17 17:27:32 +03:00
committed by GitHub
parent f6f8472b97
commit 6fb7481327
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tns-core-modules/ui/builder/builder.ts
View File

@ -81,17 +81,13 @@ const loadModule = profile("loadModule", (moduleNamePath: string, entry: ViewEnt
const viewFromBuilder = profile("viewFromBuilder", (moduleNamePath: string, moduleExports: any): View => { const viewFromBuilder = profile("viewFromBuilder", (moduleNamePath: string, moduleExports: any): View => {
// Possible XML file path. // Possible XML file path.
const fileName = resolveFileName(moduleNamePath, "xml"); const fileName = resolveFileName(moduleNamePath, "xml");
if (fileName) {
// Or check if the file exists in the app modules and load the page from XML.
return loadPage(moduleNamePath, fileName, moduleExports);
}
// Attempts to implement https://github.com/NativeScript/NativeScript/issues/1311 // Attempts to implement https://github.com/NativeScript/NativeScript/issues/1311
// if (page && fileName === `${moduleNamePath}.port.xml` || fileName === `${moduleNamePath}.land.xml`){ // if (page && fileName === `${moduleNamePath}.port.xml` || fileName === `${moduleNamePath}.land.xml`){
// page["isBiOrientational"] = true; // page["isBiOrientational"] = true;
// } // };
return null; return loadPage(moduleNamePath, fileName, moduleExports);
}) })
export const createViewFromEntry = profile("createViewFromEntry", (entry: ViewEntry): View => { export const createViewFromEntry = profile("createViewFromEntry", (entry: ViewEntry): View => {
@ -143,8 +139,13 @@ const moduleCreateView = profile("module.createView", (moduleNamePath: string, m
function loadInternal(fileName: string, context?: any, moduleNamePath?: string): ComponentModule { function loadInternal(fileName: string, context?: any, moduleNamePath?: string): ComponentModule {
let componentModule: ComponentModule; let componentModule: ComponentModule;
// Check if the XML file exists. const appPath = knownFolders.currentApp().path;
if (File.exists(fileName)) { const filePathRelativeToApp = (moduleNamePath && moduleNamePath.startsWith(appPath) ? "./" + moduleNamePath.substr(appPath.length + 1) : moduleNamePath) + ".xml";
if (global.moduleExists(filePathRelativeToApp)) {
var text = global.loadModule(filePathRelativeToApp);
componentModule = parseInternal(text, context, fileName, moduleNamePath);
} else if (fileName && File.exists(fileName)) {
const file = File.fromPath(fileName); const file = File.fromPath(fileName);
const text = file.readTextSync((error) => { throw new Error("Error loading file " + fileName + " :" + error.message) }); const text = file.readTextSync((error) => { throw new Error("Error loading file " + fileName + " :" + error.message) });
componentModule = parseInternal(text, context, fileName, moduleNamePath); componentModule = parseInternal(text, context, fileName, moduleNamePath);