Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some behaviors of the new Debugger command history

Browse source
This commit is contained in:
Jeff Parsons 2014-11-19 21:59:59 -08:00 • committed by jeffpar
commit 744cad527d
1 changed files with 10 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/pcjs/lib/debugger.js
View file

@ -1262,22 +1262,8 @@ if (DEBUGGER) {
if (event.keyCode == Keyboard.KEYCODE.CR) { if (event.keyCode == Keyboard.KEYCODE.CR) {
sInput = control.value; sInput = control.value;
control.value = ""; control.value = "";
/* var a = dbg.parseCommand(sInput, true);
* The following preventDefault() hack seems to be necessary only for IE, which insists on giving for (var s in a) dbg.doCommand(a[s]);
* focus to the debugEnter control after we've processed KEYCODE.CR for the debugInput control.
* This hack allows focus to remain with debugInput.
*
* NOTE: In IE9, I was able to resolve this problem (or so I thought) by forcing focus back to the
* debugInput control (eg, "control.focus()") but that wasn't working in IE10. Here's hoping this
* also works in IE9 until I have a chance to test it.
*
* UPDATE: The above notes regarding IE are in reference to an "onkeypress" handler; this code
* has since been changed to an "onkeydown" handler, so not everything noted above may still apply.
*/
if (sInput) {
var a = dbg.parseCommand(sInput, true);
for (var s in a) dbg.doCommand(a[s]);
}
} }
else { else {
if (event.keyCode == Keyboard.KEYCODE.UP) { if (event.keyCode == Keyboard.KEYCODE.UP) {
@ -1310,14 +1296,9 @@ if (DEBUGGER) {
500, 100, 500, 100,
function onClickDebugEnter(fRepeat) { function onClickDebugEnter(fRepeat) {
if (dbg.controlDebug) { if (dbg.controlDebug) {
var s = dbg.controlDebug.value; var sInput = dbg.controlDebug.value;
/* var a = dbg.parseCommand(sInput, true, true);
* NOTE: If we wanted to use the debugEnter button to repeatedly enter the same command, it for (var s in a) dbg.doCommand(a[s]);
* used to be the case that we couldn't clear the command string. That's apparently no longer true.
*/
dbg.controlDebug.value = "";
var a = dbg.parseCommand(s, true);
for (s in a) dbg.doCommand(a[s]);
return true; return true;
} }
if (DEBUG) dbg.log("no debugger input buffer"); if (DEBUG) dbg.log("no debugger input buffer");
@ -4731,24 +4712,25 @@ if (DEBUGGER) {
}; };
/** /**
* parseCommand(sCmd, fSave) * parseCommand(sCmd, fSave, fRepeat)
* *
* @this {Debugger} * @this {Debugger}
* @param {string|undefined} sCmd * @param {string|undefined} sCmd
* @param {boolean} [fSave] is true to save the command, false if not * @param {boolean} [fSave] is true to save the command, false if not
* @param {boolean} [fRepeat] is true if the command may be repeated (and therefore iPrevCmd should not be decremented)
* @return {Array.<string>} * @return {Array.<string>}
*/ */
Debugger.prototype.parseCommand = function(sCmd, fSave) Debugger.prototype.parseCommand = function(sCmd, fSave, fRepeat)
{ {
if (fSave) { if (fSave) {
if (!sCmd) { if (!sCmd) {
sCmd = this.aPrevCmds[0]; sCmd = this.aPrevCmds[this.iPrevCmd+1];
} else { } else {
if (this.iPrevCmd < 0 || sCmd != this.aPrevCmds[this.iPrevCmd]) { if (this.iPrevCmd < 0 || sCmd != this.aPrevCmds[this.iPrevCmd]) {
this.aPrevCmds.splice(0, 0, sCmd); this.aPrevCmds.splice(0, 0, sCmd);
this.iPrevCmd = 0; this.iPrevCmd = 0;
} }
this.iPrevCmd--; if (!fRepeat) this.iPrevCmd--;
} }
} }
var a = (sCmd? sCmd.split(sCmd.indexOf('|') >= 0? '|' : ';') : ['']); var a = (sCmd? sCmd.split(sCmd.indexOf('|') >= 0? '|' : ';') : ['']);