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 hint key processing.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-19 23:09:29 -05:00
parent 28639ad25e
commit 8142d837c1
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/buffer.js
View File

@@ -1198,9 +1198,9 @@ var Buffer = Module("buffer", {
* Adjusts the page zoom of the current buffer relative to the * Adjusts the page zoom of the current buffer relative to the
* current zoom level. * current zoom level.
* *
* @param {number} steps The number of natural fractions by which to * @param {number} steps The integral number of natural fractions by
* adjust the current page zoom. If positive, the zoom level is * which to adjust the current page zoom. If positive, the zoom
* increased, if negative it is decreased. * level is increased, if negative it is decreased.
* @param {boolean} fullZoom If true, zoom all content of the page, * @param {boolean} fullZoom If true, zoom all content of the page,
* including raster images. If false, zoom only text. If omitted, * including raster images. If false, zoom only text. If omitted,
* use the current zoom function. @optional * use the current zoom function. @optional

10
common/content/events.js
View File

@@ -967,17 +967,14 @@ var Events = Module("events", {
} }
} }
let refeed, ownsBuffer = 0, buffer, waiting = 0; let refeed, buffer, waiting = 0;
for (let input in values(processors)) { for (let input in values(processors)) {
var res = input.process(event); var res = input.process(event);
ownsBuffer += !!input.main.ownsBuffer;
waiting += res == Events.WAIT; waiting += res == Events.WAIT;
buffer = buffer || input.inputBuffer; buffer = buffer || input.inputBuffer;
if (isArray(res) && !waiting) if (isArray(res) && !waiting)
refeed = res; refeed = res;
else if (res !== Events.PASS)
refeed = null;
if (res === Events.KILL) if (res === Events.KILL)
break; break;
} }
@@ -990,7 +987,7 @@ var Events = Module("events", {
res = dactyl.trapErrors(input.fallthrough, input, event); res = dactyl.trapErrors(input.fallthrough, input, event);
} }
if (!ownsBuffer) if (!keyModes.some(function (m) m.ownsBuffer))
statusline.updateInputBuffer(buffer); statusline.updateInputBuffer(buffer);
if (waiting) if (waiting)
@@ -998,6 +995,9 @@ var Events = Module("events", {
else if (res === Events.KILL && (mode.main & (modes.TEXT_EDIT | modes.VISUAL))) else if (res === Events.KILL && (mode.main & (modes.TEXT_EDIT | modes.VISUAL)))
dactyl.beep(); dactyl.beep();
if (res !== Events.PASS && !isArray(res))
refeed = null;
if (refeed && refeed[0] && (!refeed[0].getPreventDefault() || refeed[0].dactylDefaultPrevented)) { if (refeed && refeed[0] && (!refeed[0].getPreventDefault() || refeed[0].dactylDefaultPrevented)) {
res = Events.PASS; res = Events.PASS;
refeed.shift(); refeed.shift();

1
common/content/modes.js
View File

@@ -37,6 +37,7 @@ var Modes = Module("modes", {
this.addMode("BASE", { this.addMode("BASE", {
description: "The base mode for all other modes", description: "The base mode for all other modes",
bases: [],
count: false count: false
}); });
this.addMode("MAIN", { this.addMode("MAIN", {