gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-06 01:14:10 +01:00
Code Issues Projects Releases Wiki Activity

Fix g<, sort-of. Fix some commandline.echo quirks, as well.

Browse Source
This commit is contained in:
Kris Maglione
2008-12-19 15:12:38 -05:00
parent effeef7af6
commit f5b2173979
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/content/ui.js
View File

@@ -568,10 +568,10 @@ function CommandLine() //{{{
* after interpolated data. * after interpolated data.
*/ */
XML.ignoreWhitespace = typeof str != "xml"; XML.ignoreWhitespace = typeof str != "xml";
let output = util.xmlToDom(<div class="ex-command-output" style="white-space: nowrap" highlight={highlightGroup}>{template.maybeXML(str)}</div>, doc); lastMowOutput = <div class="ex-command-output" style="white-space: nowrap" highlight={highlightGroup}>{template.maybeXML(str)}</div>;
let output = util.xmlToDom(lastMowOutput, doc);
XML.ignoreWhitespace = true; XML.ignoreWhitespace = true;
lastMowOutput = output;
// FIXME: need to make sure an open MOW is closed when commands // FIXME: need to make sure an open MOW is closed when commands
// that don't generate output are executed // that don't generate output are executed
@@ -778,8 +778,7 @@ function CommandLine() //{{{
function () function ()
{ {
if (lastMowOutput) if (lastMowOutput)
commandline.echo(lastMowOutput, echoMultiline(lastMowOutput, commandline.HL_NORMAL);
commandline.HL_NORMAL, commandline.FORCE_MULTILINE);
else else
liberator.beep(); liberator.beep();
}); });
@@ -986,7 +985,10 @@ function CommandLine() //{{{
let action = echoLine; let action = echoLine;
if (!single && (!outputContainer.collapsed || messageBox.value == lastEcho)) if (!single && (!outputContainer.collapsed || messageBox.value == lastEcho))
{
highlightGroup += " Message";
action = echoMultiline; action = echoMultiline;
}
if ((flags & this.FORCE_MULTILINE) || (/\n/.test(str) || typeof str == "xml") && !(flags & this.FORCE_SINGLELINE)) if ((flags & this.FORCE_MULTILINE) || (/\n/.test(str) || typeof str == "xml") && !(flags & this.FORCE_SINGLELINE))
action = echoMultiline; action = echoMultiline;