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

Fix multiline-input

Browse Source
This commit is contained in:
Kris Maglione
2008-12-22 19:42:38 -05:00
parent c64a3507a0
commit db87ca56f8
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

@@ -518,8 +518,7 @@ function CommandLine() //{{{
// Whether the command line must be open. // Whether the command line must be open.
function commandShown() modes.main == modes.COMMAND_LINE && function commandShown() modes.main == modes.COMMAND_LINE &&
!(modes.extended & modes.INPUT_MULTILINE) && !(modes.extended & (modes.INPUT_MULTILINE | modes.OUTPUT_MULTILINE));
!(modes.extended & modes.OUTPUT_MULTILINE);
// sets the prompt - for example, : or / // sets the prompt - for example, : or /
function setPrompt(val, highlightGroup) function setPrompt(val, highlightGroup)
@@ -603,7 +602,7 @@ function CommandLine() //{{{
{ {
let lines = multilineInputWidget.value.split("\n").length - 1; let lines = multilineInputWidget.value.split("\n").length - 1;
multilineInputWidget.setAttribute("rows", Math.min(lines, 1)); multilineInputWidget.setAttribute("rows", Math.max(lines, 1));
} }
// used for the :echo[err] commands // used for the :echo[err] commands
@@ -1036,8 +1035,11 @@ function CommandLine() //{{{
// @param untilRegexp // @param untilRegexp
inputMultiline: function inputMultiline(untilRegexp, callbackFunc) inputMultiline: function inputMultiline(untilRegexp, callbackFunc)
{ {
// save the mode, because we need to restore it // Kludge.
let cmd = !commandWidget.collapsed && this.command;
modes.push(modes.COMMAND_LINE, modes.INPUT_MULTILINE); modes.push(modes.COMMAND_LINE, modes.INPUT_MULTILINE);
if (cmd != false)
echoLine(cmd, this.HL_NORMAL);
// save the arguments, they are needed in the event handler onEvent // save the arguments, they are needed in the event handler onEvent
multilineRegexp = untilRegexp; multilineRegexp = untilRegexp;