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

[bootstrap] Merge default.

Browse Source 
--HG--
branch : bootstrapped
This commit is contained in:
Kris Maglione
2010-12-27 00:34:19 -05:00
parent 0bd5210910 f2bcfa99ea
commit 15b2909bc1
11 changed files with 153 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/content/events.js
View File

@@ -206,7 +206,6 @@ var Events = Module("events", {
}
catch (e) {}
buffer.loaded = 1; // even if not a full page load, assume it did load correctly before starting the macro
modes.replaying = true;
res = events.feedkeys(this._macros.get(this._lastMacro).keys, { noremap: true });
modes.replaying = false;
@@ -657,15 +656,14 @@ var Events = Module("events", {
commandline.clear();
// TODO: allow macros to be continued when page does not fully load with an option
let ret = (buffer.loaded == 1);
if (!ret)
if (!buffer.loaded)
dactyl.echoerr("Page did not load completely in " + maxWaitTime + " seconds. Macro stopped.");
// sometimes the input widget had focus when replaying a macro
// maybe this call should be moved somewhere else?
// dactyl.focusContent(true);
return ret;
return buffer.loaded;
},
onDOMMenuBarActive: function () {
@@ -1106,8 +1104,7 @@ var Events = Module("events", {
else if (this.pendingArgMap) {
let map = this.pendingArgMap;
if (!Events.isEscape(key))
if (!modes.replaying || this.waitForPageLoad())
execute(map, null, this.count, key);
execute(map, null, this.count, key);
return true;
}
else if (map && !event.skipmap && candidates.length == 0) {
@@ -1136,8 +1133,7 @@ var Events = Module("events", {
if (modes.replaying && !this.waitForPageLoad())
return true;
let ret = execute(map, null, this.count);
return !(map.route && ret);
return !execute(map, null, this.count) || !map.route
}
}
else if (mappings.getCandidates(this.main, candidateCommand).length > 0 && !event.skipmap) {