Merge branch 'master' of git://github.com/280north/cappuccino

This commit is contained in:
Stephen Ierodiaconou committed 2009-10-14 14:30:13 +01:00
commit 5104d323bb
5 files changed
+5 -5

No files matched your search

+1 -1
+1 -1
View File
@@ -106,7 +106,7 @@ function objj_printf(string)
}
#if RHINO
var warning_stream = function (aString) { Packages.java.lang.System.out.println(aString) };
var warning_stream = function (aString) { print(aString) };
#else
if (window.console && window.console.warn)
var warning_stream = function(aString) { window.console.warn(aString); }
+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