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

Merge default.

Browse Source 
--HG--
branch : mode-refactoring
This commit is contained in:
Kris Maglione
2010-10-08 23:45:52 -04:00
parent 25dd6a1f5b f40ed2e734
commit fbba50e267
7 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
common/content/hints.js
View File

@@ -72,7 +72,14 @@ const Hints = Module("hints", {
_reset: function (slight) {
if (!slight) {
this.__reset();
this.prevInput = "";
this.escNumbers = false;
this._usedTabKey = false;
this._canUpdate = false;
this._hintNumber = 0;
this._hintString = "";
statusline.updateInputBuffer("");
commandline.command = "";
}
this._pageHints = [];
this._validHints = [];
@@ -83,13 +90,8 @@ const Hints = Module("hints", {
this._activeTimeout = null;
},
__reset: function () {
statusline.updateInputBuffer("");
this._hintString = "";
this._hintNumber = 0;
this._usedTabKey = false;
this.prevInput = "";
this.escNumbers = false;
commandline.command = "";
if (!this._usedTabKey)
this._hintNumber = 0;
},
/**
@@ -478,7 +480,8 @@ const Hints = Module("hints", {
let top = this._top;
if (this._continue) {
this.__reset();
this._showHints();
if (this._validHints.length <= 1)
this._showHints();
}
else {
this._removeHints(timeout);
@@ -491,7 +494,8 @@ const Hints = Module("hints", {
if ((modes.extended & modes.HINTS) && !this._continue)
modes.pop();
commandline._lastEcho = null; // Hack.
this._hintMode.action(elem, elem.href || "", this._extendedhintCount, top);
this._hintMode.action(elem, elem.href || elem.src || "",
this._extendedhintCount, top);
}, timeout);
return true;
},
@@ -764,7 +768,10 @@ const Hints = Module("hints", {
commandline.input(this._hintMode.prompt + ": ", null, {
extended: modes.HINTS,
leave: function () { hints.hide(); },
leave: function (stack) {
if (!stack.push)
hints.hide();
},
onChange: this.closure._onInput
});
modes.extended = modes.HINTS;
@@ -1078,7 +1085,9 @@ const Hints = Module("hints", {
options.add(["extendedhinttags", "eht"],
"XPath string of hintable elements activated by ';'",
"regexmap", "[iI]:" + Option.quote(util.makeXPath(["img"])),
"regexmap", "[iI]:" + Option.quote(util.makeXPath(["img"])) +
",[OTivVWy]:" + Option.quote(util.makeXPath(
["{a,area}[@href]", "{img,iframe}[@src]"])),
{ validator: Option.validateXPath });
options.add(["hinttags", "ht"],