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

Merge pull request #286 from NativeScript/feature/device-specific-code-behind

Browse Source 
Fix: Device-specific code behind JS files are not loaded
This commit is contained in:
Alexander Vakrilov
2015-04-17 10:36:31 +03:00
parent 8ce5784b10 3c1f3cd738
commit ab7b526e93
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,10 +47,13 @@ function resolvePageFromEntry(entry: definition.NavigationEntry): pages.Page {
var moduleNamePath = fs.path.join(currentAppPath, entry.moduleName); var moduleNamePath = fs.path.join(currentAppPath, entry.moduleName);
var moduleExports; var moduleExports;
var moduleExportsResolvedPath = resolveFilePath(moduleNamePath, "js");
if (moduleExportsResolvedPath) {
trace.write("Loading JS file: " + moduleExportsResolvedPath, trace.categories.Navigation);
if (fs.File.exists(moduleNamePath + ".js")) { // Exclude extension when doing require.
trace.write("Loading JS file: " + moduleNamePath + ".js", trace.categories.Navigation); moduleExportsResolvedPath = moduleExportsResolvedPath.substr(0, moduleExportsResolvedPath.length - 3)
moduleExports = require(moduleNamePath); moduleExports = require(moduleExportsResolvedPath);
} }
if (moduleExports && moduleExports.createPage) { if (moduleExports && moduleExports.createPage) {
@ -70,7 +73,7 @@ function resolvePageFromEntry(entry: definition.NavigationEntry): pages.Page {
} }
var fileNameResolver: fileResolverModule.FileNameResolver; var fileNameResolver: fileResolverModule.FileNameResolver;
function resolveFilePath(path, ext) { function resolveFilePath(path, ext) : string {
if (!fileNameResolver) { if (!fileNameResolver) {
fileNameResolver = new fileResolverModule.FileNameResolver({ fileNameResolver = new fileResolverModule.FileNameResolver({
width: platform.screen.mainScreen.widthDIPs, width: platform.screen.mainScreen.widthDIPs,