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

Fix for FireFox not working.

Browse Source 
Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I
2010-01-30 00:35:59 -08:00
parent e25a550d3f
commit d735cd98e7
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/Themes/BlendKit/BKThemeDescriptor.j
+1 -1
View File
@@ -40,7 +40,7 @@ var ItemSizes = { },
// Grab Theme Descriptor Classes.
var themeDescriptorClasses = [];
for (candidate in window)
for (candidate in global)
{
var theClass = objj_getClass(candidate),
theClassName = class_getName(theClass);
Objective-J/Executable.js
+2 -2
View File
@@ -73,7 +73,7 @@ Executable.prototype.path = function()
Executable.prototype.functionParameters = function()
{
var functionParameters = ["objj_executeFile", "objj_importFile"];
var functionParameters = ["global", "objj_executeFile", "objj_importFile"];
//exportedNames().concat("objj_executeFile", "objj_importFile");
@@ -87,7 +87,7 @@ Executable.prototype.functionParameters = function()
Executable.prototype.functionArguments = function()
{
var path = this.path(),
functionArguments = [fileExecuterForPath(path), fileImporterForPath(path)];
functionArguments = [global, fileExecuterForPath(path), fileImporterForPath(path)];
//functionArguments = exportedValues().concat(fileExecuterForPath(path), fileImporterForPath(path));
Objective-J/Jakefile
+11 -2
View File
@@ -33,10 +33,19 @@ $BUILD_BROWSER_FILE = FILE.join($BUILD_OBJECTIVE_J, "Objective-J.js");
$INCLUDE_FLAGS = " -I" + FILE.cwd();
filedir($BUILD_BROWSER_FILE, $BROWSER_FILE, function(aTask)
{
{/*
var methods = ["join", "isAbsolute", "absolute", "basename"],
implementations = { };
methods.forEach(function(aMethod)
{
implementations[aMethod] = FILE[aMethod].toString().replace(/exports/, "FILE");
print(implementations[aMethod])
});
*/
gcc($BROWSER_FILE,
$BUILD_BROWSER_FILE,
environmentFlags("Browser", "ObjJ") + $INCLUDE_FLAGS, true);
environmentFlags("Browser", "ObjJ") + $INCLUDE_FLAGS, $CONFIGURATION !== "Debug");
});
$LICENSE = FILE.join("CommonJS", "lib", "objective-j", "jake", "LICENSES", "LGPL-v2.1");
Objective-J/StaticResourceNode.js
+6 -4
View File
@@ -237,6 +237,11 @@ function resolvePathComponents(/*StaticResourceNode*/ startNode, /*Type*/aType,
var count = components.length,
parentNode = startNode;
function continueResolution()
{
resolvePathComponents(parentNode, aType, components, index, aCallback);
}
for (; index < count; ++index)
{
var name = components[index],
@@ -245,12 +250,9 @@ function resolvePathComponents(/*StaticResourceNode*/ startNode, /*Type*/aType,
//CPLog(name + " of " + parentNode.name() + " " + (childNode && childNode.name()));
//CPLog(parentNode._childNodes);
// + "(" + components + ")" + " " + index + "/" + count + ":" + (childNode && childNode.name()) +">" + (childNode ? 1:0) + " " + (childNode && childNode.isResolved()));
if (!childNode)
{
function continueResolution()
{
resolvePathComponents(parentNode, aType, components, index, aCallback);
}
if (index + 1 < count || aType === StaticResourceNode.DirectoryType)
{