colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-09 18:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

More consistent naming scheme.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I committed 2010-01-29 15:16:22 -08:00
1 parent 59660032e1
commit 4b7310d0cb
14 files changed
+269 -246
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Objective-J/Executable.js
+10 -6
View File
@@ -73,7 +73,9 @@ Executable.prototype.path = function()
Executable.prototype.functionParameters = function()
{
var functionParameters = exportedNames().concat("objj_executeFile", "objj_importFile");
var functionParameters = ["objj_executeFile", "objj_importFile"];
//exportedNames().concat("objj_executeFile", "objj_importFile");
#ifdef COMMONJS
functionParameters = functionParameters.concat("require", "exports", "module", "system", "print", "window");
@@ -84,8 +86,10 @@ Executable.prototype.functionParameters = function()
Executable.prototype.functionArguments = function()
{
var path = this.path()
functionArguments = exportedValues().concat(fileExecuterForPath(path), fileImporterForPath(path));
var path = this.path(),
functionArguments = [fileExecuterForPath(path), fileImporterForPath(path)];
//functionArguments = exportedValues().concat(fileExecuterForPath(path), fileImporterForPath(path));
#ifdef COMMONJS
functionArguments = functionArguments.concat(Executable.commonJSArguments());
@@ -123,7 +127,7 @@ Executable.prototype.execute = function()
#endif
var oldContextBundle = CONTEXT_BUNDLE;
CONTEXT_BUNDLE = Bundle.bundleContainingPath(this.path());
CONTEXT_BUNDLE = CFBundle.bundleContainingPath(this.path());
var result = this._function.apply(global, this.functionArguments());
@@ -165,8 +169,8 @@ Executable.prototype.loadFileDependencies = function()
var searchedPaths = [{ }, { }],
foundExecutablePaths = { },
fileExecutableSearches = new MutableDictionary(),
incompleteFileExecutableSearches = new MutableDictionary();
fileExecutableSearches = new CFMutableDictionary(),
incompleteFileExecutableSearches = new CFMutableDictionary();
foundExecutablePaths[this.path()] = this;