gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-22 02:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Guard against future stupidity.

Browse Source
This commit is contained in:
Kris Maglione
2013-08-01 21:39:51 -07:00
parent b65dbd00ee
commit bbb14eaf83
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/commandline.js
View File

@@ -802,7 +802,7 @@ var CommandLine = Module("commandline", {
if ((flags & this.FORCE_MULTILINE) || (/\n/.test(data) || !isinstance(data, [_, "String"])) && !(flags & this.FORCE_SINGLELINE)) if ((flags & this.FORCE_MULTILINE) || (/\n/.test(data) || !isinstance(data, [_, "String"])) && !(flags & this.FORCE_SINGLELINE))
action = mow.closure.echo; action = mow.closure.echo;
let single = function () action == self._echoLine; let checkSingleLine = function () action == self._echoLine;
if (forceSingle) { if (forceSingle) {
this._lastEcho = null; this._lastEcho = null;
@@ -810,11 +810,11 @@ var CommandLine = Module("commandline", {
} }
else { else {
// So complicated... // So complicated...
if (single() && !this.widgets.mowContainer.collapsed) { if (checkSingleLine() && !this.widgets.mowContainer.collapsed) {
highlightGroup += " Message"; highlightGroup += " Message";
action = mow.closure.echo; action = mow.closure.echo;
} }
else if (!single() && this.widgets.mowContainer.collapsed) { else if (!checkSingleLine() && this.widgets.mowContainer.collapsed) {
if (this._lastEcho && this.widgets.message && this.widgets.message[1] == this._lastEcho.msg) { if (this._lastEcho && this.widgets.message && this.widgets.message[1] == this._lastEcho.msg) {
if (!(this._lastEcho.flags & this.APPEND_TO_MESSAGES)) if (!(this._lastEcho.flags & this.APPEND_TO_MESSAGES))
appendToMessages(this._lastEcho.data); appendToMessages(this._lastEcho.data);
@@ -832,20 +832,20 @@ var CommandLine = Module("commandline", {
else if (this._lastEcho && this.widgets.message && this.widgets.message[1] == this._lastEcho.msg) { else if (this._lastEcho && this.widgets.message && this.widgets.message[1] == this._lastEcho.msg) {
if (!(this._lastEcho.flags & this.APPEND_TO_MESSAGES)) if (!(this._lastEcho.flags & this.APPEND_TO_MESSAGES))
appendToMessages(this._lastEcho.data); appendToMessages(this._lastEcho.data);
if (single() && !(flags & this.APPEND_TO_MESSAGES)) if (checkSingleLine() && !(flags & this.APPEND_TO_MESSAGES))
appendToMessages(data); appendToMessages(data);
flags |= this.APPEND_TO_MESSAGES; flags |= this.APPEND_TO_MESSAGES;
this.hiddenMessages++; this.hiddenMessages++;
} }
this._lastEcho = single() && { flags: flags, msg: data, data: arguments[0] }; this._lastEcho = checkSingleLine() && { flags: flags, msg: data, data: arguments[0] };
} }
this._lastClearable = action === this._echoLine && String(data); this._lastClearable = action === this._echoLine && String(data);
this._lastEchoTime = (flags & this.FORCE_SINGLELINE) && Date.now(); this._lastEchoTime = (flags & this.FORCE_SINGLELINE) && Date.now();
if (action) if (action)
action.call(this, data, highlightGroup, single()); action.call(this, data, highlightGroup, checkSingleLine());
}, },
_lastEchoTime: 0, _lastEchoTime: 0,