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

Do not use lazy requires where not needed.

Browse Source
This commit is contained in:
atanasovg
2016-01-25 16:33:18 +02:00
parent 62d85b0dc0
commit 56f1aaa795
63 changed files with 581 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ui/frame/frame-common.ts
View File

@@ -3,12 +3,17 @@ import {View, CustomLayoutView} from "ui/core/view";
import {Page} from "ui/page";
import {isString, isFunction, isDefined} from "utils/types";
import * as trace from "trace";
import {load as buildModule} from "ui/builder";
import {knownFolders, path} from "file-system";
import {resolveFileName} from "file-system/file-name-resolver";
import * as fileSystemModule from "file-system";
import * as fs from "file-system";
import * as builderModule from "ui/builder";
var builder: typeof builderModule;
function ensureBuilder() {
if (!builder) {
builder = require("ui/builder");
}
}
var frameStack: Array<Frame> = [];
function buildEntryFromArgs(arg: any): definition.NavigationEntry {
@@ -58,12 +63,10 @@ export function resolvePageFromEntry(entry: definition.NavigationEntry): Page {
}
}
else if (entry.moduleName) {
var fs: typeof fileSystemModule = require("file-system");
// Current app full path.
var currentAppPath = knownFolders.currentApp().path;
var currentAppPath = fs.knownFolders.currentApp().path;
//Full path of the module = current app full path + module name.
var moduleNamePath = path.join(currentAppPath, entry.moduleName);
var moduleNamePath = fs.path.join(currentAppPath, entry.moduleName);
var moduleExports;
if (global.moduleExists(entry.moduleName)) {
@@ -111,10 +114,10 @@ function pageFromBuilder(moduleNamePath: string, moduleExports: any): Page {
if (fileName) {
trace.write("Loading XML file: " + fileName, trace.categories.Navigation);
var builder: typeof builderModule = require("ui/builder");
ensureBuilder();
// Or check if the file exists in the app modules and load the page from XML.
element = buildModule(fileName, moduleExports);
element = builder.load(fileName, moduleExports);
if (element instanceof Page) {
page = <Page>element;
}