colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-07 03:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jake

Browse Source 
Conflicts:
	Objective-J/Runtime/constants.js
This commit is contained in:
Francisco Ryan Tolmasky I
2009-10-13 13:45:41 -07:00
parent 6b02a4105b 5e658354ab
commit 2cc723752e
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
External/browserjs
Vendored
+1 -1
Submodule External/browserjs updated: b01b92b128...9eb026b82b
External/jack
Vendored
+1 -1
Submodule External/jack updated: ec86b9afb8...3ee7b56812
External/narwhal
Vendored
+1 -1
Submodule External/narwhal updated: 0a92f837cc...4eb47f95f1
Objective-J/Runtime/evaluate.js
+1 -1
View File
@@ -162,7 +162,7 @@ function fragment_evaluate_code(aFragment)
if (typeof system !== "undefined" && system.engine === "rhino")
compiled = Packages.org.mozilla.javascript.Context.getCurrentContext().compileFunction(window, functionText, GET_FILE(aFragment).path, 0, null);
else
compiled = eval(functionText);
compiled = eval("("+functionText+")");
#else
// "//@ sourceURL=" at the end lets us name our eval'd files for debuggers, etc.
// * WebKit: http://pmuellr.blogspot.com/2009/06/debugger-friendly.html