gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-29 20:35:45 +01:00
Code Issues Projects Releases Wiki Activity

Push too-long echoed lines to the MOW.

Browse Source
This commit is contained in:
Kris Maglione
2008-10-29 06:43:23 +00:00
parent 7e614099a2
commit ca150fcd31
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
content/ui.js
View File

@@ -126,6 +126,7 @@ function CommandLine() //{{{
var promptWidget = document.getElementById("liberator-commandline-prompt"); var promptWidget = document.getElementById("liberator-commandline-prompt");
// the command bar which contains the current command // the command bar which contains the current command
var commandWidget = document.getElementById("liberator-commandline-command"); var commandWidget = document.getElementById("liberator-commandline-command");
commandWidget.inputField.QueryInterface(Components.interfaces.nsIDOMNSEditableElement);
// the widget used for multiline output // the widget used for multiline output
var multilineOutputWidget = document.getElementById("liberator-multiline-output"); var multilineOutputWidget = document.getElementById("liberator-multiline-output");
@@ -203,11 +204,18 @@ function CommandLine() //{{{
commandWidget.value = cmd; commandWidget.value = cmd;
} }
function setLine(str, highlightGroup) function setLine(str, highlightGroup, forceSingle)
{ {
setHighlightGroup(highlightGroup); setHighlightGroup(highlightGroup);
setPrompt(""); setPrompt("");
setCommand(str); setCommand(str);
if (!forceSingle &&
commandWidget.inputField.editor
.selection.getRangeAt(0)
.startContainer.parentNode
.scrollWidth > commandWidget.inputField.scrollWidth)
// Yeah, the min-width is stupid. Somehow, it doesn't work otherwise.
setMultiline(<p style={"white-space: normal; min-width: " + commandWidget.inputField.scrollWidth + "px; width: 100%"}>{str}</p>, highlightGroup);
} }
// TODO: extract CSS // TODO: extract CSS
@@ -257,14 +265,14 @@ function CommandLine() //{{{
elements[elements.length - 1].scrollIntoView(true); elements[elements.length - 1].scrollIntoView(true);
if (win.scrollY >= win.scrollMaxY) if (win.scrollY >= win.scrollMaxY)
setLine("Press ENTER or type command to continue", commandline.HL_QUESTION); setLine("Press ENTER or type command to continue", commandline.HL_QUESTION, true);
else else
setLine("-- More --", commandline.HL_QUESTION); setLine("-- More --", commandline.HL_QUESTION, true);
} }
else else
{ {
win.scrollTo(0, contentHeight); win.scrollTo(0, contentHeight);
setLine("Press ENTER or type command to continue", commandline.HL_QUESTION); setLine("Press ENTER or type command to continue", commandline.HL_QUESTION, true);
} }
win.focus(); win.focus();
@@ -1185,7 +1193,7 @@ function CommandLine() //{{{
{ {
const selType = Components.interfaces.nsISelectionController["SELECTION_" + type]; const selType = Components.interfaces.nsISelectionController["SELECTION_" + type];
let editor = document.getElementById("liberator-commandline-command") let editor = document.getElementById("liberator-commandline-command")
.inputField.QueryInterface(Components.interfaces.nsIDOMNSEditableElement).editor; .inputField.editor;
let sel = editor.selectionController.getSelection(selType); let sel = editor.selectionController.getSelection(selType);
sel.removeAllRanges(); sel.removeAllRanges();