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

[bootstrap] Merge default.

Browse Source 
--HG--
branch : bootstrapped
rename : common/content/modules.js => common/modules/overlay.jsm
This commit is contained in:
Kris Maglione
2010-12-25 16:02:01 -05:00
parent 1653ff509d dca9f2df86
commit e5fd0ccf18
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/commandline.js
View File

@@ -446,7 +446,7 @@ var CommandLine = Module("commandline", {
* @returns {boolean} * @returns {boolean}
*/ */
get commandVisible() modes.main == modes.COMMAND_LINE && get commandVisible() modes.main == modes.COMMAND_LINE &&
!(modes.extended & (modes.INPUT_MULTILINE | modes.OUTPUT_MULTILINE)), !(modes.extended & modes.INPUT_MULTILINE),
/** /**
* Ensure that the multiline input widget is the correct size. * Ensure that the multiline input widget is the correct size.
@@ -620,9 +620,9 @@ var CommandLine = Module("commandline", {
this.widgets.message = null; this.widgets.message = null;
if (modes.main != modes.COMMAND_LINE) if (modes.main != modes.COMMAND_LINE)
this.widgets.command = null; this.widgets.command = null;
if ((modes.extended & modes.OUTPUT_MULTILINE) && this.widgets.multilineOutput.atEnd) if (modes.main == modes.OUTPUT_MULTILINE && this.widgets.multilineOutput.atEnd)
modes.pop(); modes.pop();
if (modes.extended != modes.OUTPUT_MULTILINE) if (modes.main != modes.OUTPUT_MULTILINE)
this.multilineOutputVisible = false; this.multilineOutputVisible = false;
}, },
@@ -689,8 +689,8 @@ var CommandLine = Module("commandline", {
this.hide(); this.hide();
this._startHints = false; this._startHints = false;
if (!(modes.extended & modes.OUTPUT_MULTILINE)) if (modes.main != modes.OUTPUT_MULTILINE)
modes.push(modes.COMMAND_LINE, modes.OUTPUT_MULTILINE, { modes.push(modes.OUTPUT_MULTILINE, null, {
onEvent: this.closure.onMultilineOutputEvent onEvent: this.closure.onMultilineOutputEvent
}); });
@@ -1020,7 +1020,7 @@ var CommandLine = Module("commandline", {
/** /**
* Handle events when we are in multi-line output mode, these come from * Handle events when we are in multi-line output mode, these come from
* dactyl when modes.extended & modes.MULTILINE_OUTPUT and also from * dactyl when modes.extended & modes.OUTPUT_MULTILINE and also from
* #dactyl-multiline-output in the XUL. * #dactyl-multiline-output in the XUL.
* *
* @param {Event} event * @param {Event} event

1
common/content/events.js
View File

@@ -672,6 +672,7 @@ var Events = Module("events", {
switch (dactyl.mode) { switch (dactyl.mode) {
case modes.COMMAND_LINE: case modes.COMMAND_LINE:
case modes.INSERT: case modes.INSERT:
case modes.OUTPUT_MULTILINE:
case modes.PASS_THROUGH: case modes.PASS_THROUGH:
case modes.QUOTE: case modes.QUOTE:
case modes.TEXT_EDIT: case modes.TEXT_EDIT:

2
common/content/modes.js
View File

@@ -82,12 +82,12 @@ var Modes = Module("modes", {
postExecute: function (map) { if (modes.main == modes.QUOTE && map.name === "<C-v>") modes.pop() }, postExecute: function (map) { if (modes.main == modes.QUOTE && map.name === "<C-v>") modes.pop() },
onEvent: function () { if (modes.main == modes.QUOTE) modes.pop() } onEvent: function () { if (modes.main == modes.QUOTE) modes.pop() }
}); });
this.addMode("OUTPUT_MULTILINE");
// this._extended modes, can include multiple modes, and even main modes // this._extended modes, can include multiple modes, and even main modes
this.addMode("EX", true); this.addMode("EX", true);
this.addMode("HINTS", { count: false, ownsBuffer: true }); this.addMode("HINTS", { count: false, ownsBuffer: true });
this.addMode("INPUT_MULTILINE", true); this.addMode("INPUT_MULTILINE", true);
this.addMode("OUTPUT_MULTILINE", true);
this.addMode("SEARCH_FORWARD", true); this.addMode("SEARCH_FORWARD", true);
this.addMode("SEARCH_BACKWARD", true); this.addMode("SEARCH_BACKWARD", true);
this.addMode("MENU", true); // a popupmenu is active this.addMode("MENU", true); // a popupmenu is active