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

Fix status bar command line completion window.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-28 22:09:33 -05:00
parent ca4b3a03c9
commit 2f701ac96a
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/content/commandline.js
View File

@@ -47,13 +47,6 @@ var CommandWidgets = Class("CommandWidgets", {
onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/> onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
</vbox> </vbox>
<vbox id={"dactyl-completions-" + _status + "commandline-container"} class="dactyl-container" hidden="false" collapsed="true" insertbefore="addon-bar,status-bar">
<iframe class="dactyl-completions" id={"dactyl-completions-" + _status + "commandline"} src="chrome://dactyl/content/buffer.xhtml"
contextmenu="dactyl-contextmenu"
flex="1" hidden="false" collapsed="false"
onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
</vbox>
<stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" highlight="CmdLine CmdCmdLine"> <stack orient="horizontal" align="stretch" class="dactyl-container" id="dactyl-container" highlight="CmdLine CmdCmdLine">
<textbox class="plain" id="dactyl-strut" flex="1" crop="end" collapsed="true"/> <textbox class="plain" id="dactyl-strut" flex="1" crop="end" collapsed="true"/>
<textbox class="plain" id="dactyl-mode" flex="1" crop="end"/> <textbox class="plain" id="dactyl-mode" flex="1" crop="end"/>
@@ -77,7 +70,18 @@ var CommandWidgets = Class("CommandWidgets", {
onblur="dactyl.modules.commandline.onMultilineInputEvent(event);"/> onblur="dactyl.modules.commandline.onMultilineInputEvent(event);"/>
</vbox> </vbox>
</vbox> </vbox>
</e4x>.elements() </e4x>.elements(),
before: <e4x xmlns={XUL} xmlns:dactyl={NS}>
<toolbar id={statusline.statusBar.id}>
<vbox id={"dactyl-completions-" + _status + "commandline-container"} class="dactyl-container" hidden="false" collapsed="true">
<iframe class="dactyl-completions" id={"dactyl-completions-" + _status + "commandline"} src="chrome://dactyl/content/buffer.xhtml"
contextmenu="dactyl-contextmenu"
flex="1" hidden="false" collapsed="false"
onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
</vbox>
</toolbar>
</e4x>.elements(),
}); });
this.elements = {}; this.elements = {};
@@ -709,9 +713,11 @@ var CommandLine = Module("commandline", {
// 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
if (this.widgets.mowContainer.collapsed) if (this.widgets.mowContainer.collapsed) {
elem.scrollTop = 0;
while (body.firstChild) while (body.firstChild)
body.removeChild(body.firstChild); body.removeChild(body.firstChild);
}
body.appendChild(output); body.appendChild(output);
@@ -720,7 +726,6 @@ var CommandLine = Module("commandline", {
commandline.updateOutputHeight(true); commandline.updateOutputHeight(true);
elem.scrollTop = 0;
if (options["more"] && Buffer.isScrollable(elem, 1)) { if (options["more"] && Buffer.isScrollable(elem, 1)) {
// start the last executed command's output at the top of the screen // start the last executed command's output at the top of the screen
let elements = doc.getElementsByClassName("ex-command-output"); let elements = doc.getElementsByClassName("ex-command-output");

4
common/content/statusline.js
View File

@@ -57,7 +57,9 @@ var StatusLine = Module("statusline", {
</statusbar> </statusbar>
</e4x>; </e4x>;
util.dump("statusbar: load overlay"); for each (let attr in prepend..@key)
attr.parent().@id = "dactyl-statusline-field-" + attr;
util.overlayWindow(window, { util.overlayWindow(window, {
objects: this.widgets = { get status() this.container }, objects: this.widgets = { get status() this.container },
prepend: prepend.elements() prepend: prepend.elements()