mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-13 18:23:50 +00:00
Merge branch 'master' of git://github.com/280north/cappuccino
This commit is contained in:
commit
5104d323bb
5 files changed
+5
-5
No files matched your search
Vendored
+1
-1
Submodule External/browserjs updated: b01b92b128...9eb026b82b.
Vendored
+1
-1
Submodule External/jack updated: ec86b9afb8...3ee7b56812.
Vendored
+1
-1
Submodule External/narwhal updated: 0a92f837cc...4eb47f95f1.
@@ -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); }
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user