Droog71
/
oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed console macros and tweaked some console property visibilities. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4082 127b21dd-08f5-0310-b4b7-95ae10353056
master
Jens Ayton 2011-01-16 18:19:52 +00:00
parent a8848ade0c
commit 8f6a8cad98
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DebugOXP/Resources/oolite-debug-console.js
View File

@ -538,7 +538,7 @@ this.performMacro = function performMacro(command)
consoleMessage("macro-expansion", "> " + displayExpansion);
// Perform macro.
this.evaluate(expansion);
this.evaluate(expansion, parameters);
}
else
{
@ -703,7 +703,8 @@ if (debugConsole.settings["default-macros"]) this.defaultMacros = debugConsole.
Object.defineProperty(debugConsole, "showErrorLocations",
{
get: function () { return debugConsole.__showErrorLocations },
set: function (value) { debugConsole.settings["show-error-locations"] = debugConsole.__showErrorLocations = !!value; }
set: function (value) { debugConsole.settings["show-error-locations"] = debugConsole.__showErrorLocations = !!value; },
enumerable: true
});
debugConsole.__showErrorLocations = debugConsole.settings["show-error-locations"];
@ -712,7 +713,8 @@ debugConsole.__showErrorLocations = debugConsole.settings["show-error-locations"
Object.defineProperty(debugConsole, "showErrorLocationsDuringConsoleEval",
{
get: function () { return debugConsole.settings["show-error-locations-during-console-eval"] ? true : false; },
set: function (value) { debugConsole.settings.showErrorLocationsDuringConsoleEval = !!value; }
set: function (value) { debugConsole.settings.showErrorLocationsDuringConsoleEval = !!value; },
enumerable: true
});
@ -720,7 +722,8 @@ Object.defineProperty(debugConsole, "showErrorLocationsDuringConsoleEval",
Object.defineProperty(debugConsole, "dumpStackForErrors",
{
get: function () { return debugConsole.__dumpStackForErrors },
set: function (value) { debugConsole.settings["dump-stack-for-errors"] = debugConsole.__dumpStackForErrors = !!value; }
set: function (value) { debugConsole.settings["dump-stack-for-errors"] = debugConsole.__dumpStackForErrors = !!value; },
enumerable: true
});
debugConsole.__dumpStackForErrors = debugConsole.settings["dump-stack-for-errors"];
@ -729,7 +732,8 @@ debugConsole.__dumpStackForErrors = debugConsole.settings["dump-stack-for-errors
Object.defineProperty(debugConsole, "dumpStackForWarnings",
{
get: function () { return debugConsole.__dumpStackForWarnings },
set: function (value) { debugConsole.settings["dump-stack-for-warnings"] = debugConsole.__dumpStackForWarnings = !!value; }
set: function (value) { debugConsole.settings["dump-stack-for-warnings"] = debugConsole.__dumpStackForWarnings = !!value; },
enumerable: true
});
debugConsole.__dumpStackForWarnings = debugConsole.settings["dump-stack-for-warnings"];
@ -765,7 +769,7 @@ debugConsole.__setUpCallObjC(Object.prototype);
// evaluate() is outside the closure specifically to avoid strict mode.
// If evaluate() is compiled in strict mode, all console input will also be strict.
this.evaluate = function evaluate(command)
this.evaluate = function evaluate(command, PARAM)
{
var showErrorLocations = debugConsole.__showErrorLocations;
debugConsole.__showErrorLocations = debugConsole.showErrorLocationsDuringConsoleEval;

6
src/Core/Debug/OOJSConsole.m
View File

@ -160,9 +160,9 @@ static JSPropertySpec sConsoleProperties[] =
{ "displayFPS", kConsole_displayFPS, JSPROP_PERMANENT | JSPROP_ENUMERATE },
{ "platformDescription", kConsole_platformDescription, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
{ "pedanticMode", kConsole_pedanticMode, JSPROP_PERMANENT | JSPROP_ENUMERATE },
{ "__showErrorLocations", kConsole_showErrorLocations, JSPROP_PERMANENT | JSPROP_ENUMERATE },
{ "__dumpStackForErrors", kConsole_dumpStackForErrors, JSPROP_PERMANENT | JSPROP_ENUMERATE },
{ "__dumpStackForWarnings", kConsole_dumpStackForWarnings, JSPROP_PERMANENT | JSPROP_ENUMERATE },
{ "__showErrorLocations", kConsole_showErrorLocations, JSPROP_PERMANENT },
{ "__dumpStackForErrors", kConsole_dumpStackForErrors, JSPROP_PERMANENT },
{ "__dumpStackForWarnings", kConsole_dumpStackForWarnings, JSPROP_PERMANENT },
{ "glVendorString", kConsole_glVendorString, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
{ "glRendererString", kConsole_glRendererString, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
{ "glFixedFunctionTextureUnitCount", kConsole_glFixedFunctionTextureUnitCount, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },