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

Push lines to the MOW where appropriate

Browse Source
This commit is contained in:
Kris Maglione
2008-12-07 11:33:56 -05:00
parent 7693ac5000
commit 0876a3bef2
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/content/ui.js
View File

@@ -71,6 +71,7 @@ function CommandLine() //{{{
var silent = false;
var keepCommand = false;
var lastEcho = null;
function History(inputField, mode)
{
@@ -951,12 +952,17 @@ function CommandLine() //{{{
// The DOM isn't threadsafe. It must only be accessed from the main thread.
liberator.callInMainThread(function ()
{
let action = outputContainer.collapsed ? echoLine : echoMultiline;
if (flags & commandline.FORCE_MULTILINE)
let action = echoLine;
if (!outputContainer.collapsed || messageBox.value == lastEcho)
action = echoMultiline;
else if (flags & commandline.FORCE_SINGLELINE)
let single = flags & (this.FORCE_SINGLELINE | this.DISALLOW_MULTILINE);
if (flags & this.FORCE_MULTILINE)
action = echoMultiline;
else if (flags & this.FORCE_SINGLELINE)
action = echoLine;
else if (flags & commandline.DISALLOW_MULTILINE)
else if (flags & this.DISALLOW_MULTILINE)
{
if (!outputContainer.collapsed)
action = null;
@@ -966,9 +972,18 @@ function CommandLine() //{{{
else if (/\n/.test(str) || typeof str == "xml")
action = echoMultiline;
if (single)
lastEcho = null;
else
{
if (messageBox.value == lastEcho)
echoMultiline(lastEcho);
lastEcho = (action == echoLine) && str;
}
if (action)
action(str, highlightGroup, (flags & (this.FORCE_SINGLELINE | this.DISALLOW_MULTILINE)));
});
action(str, highlightGroup, single);
}, this);
return true;
},