diff --git a/common/content/finder.js b/common/content/finder.js index 1c72bbe8..a940b8f5 100644 --- a/common/content/finder.js +++ b/common/content/finder.js @@ -16,7 +16,7 @@ const RangeFinder = Module("rangefinder", { let backwards = mode == modes.FIND_BACKWARD; commandline.open(backwards ? "?" : "/", "", mode); - if (this.rangeFind && this.rangeFind.window.get() == window) + if (this.rangeFind && this.rangeFind.window.get() === window) this.rangeFind.reset(); this.find("", backwards); }, @@ -127,9 +127,8 @@ const RangeFinder = Module("rangefinder", { set rangeFind(val) buffer.localStore.rangeFind = val, /** - * Highlights all occurrences of str in the buffer. - * - * @param {string} str The string to highlight. + * Highlights all occurrences of the last searched for string in the + * current buffer. */ highlight: function () { if (this.rangeFind) @@ -157,7 +156,6 @@ const RangeFinder = Module("rangefinder", { commandline.registerCallback("change", modes.FIND_BACKWARD, this.closure.onKeyPress); commandline.registerCallback("submit", modes.FIND_BACKWARD, this.closure.onSubmit); commandline.registerCallback("cancel", modes.FIND_BACKWARD, this.closure.onCancel); - }, commands: function () { commands.add(["noh[lsearch]"], @@ -321,7 +319,7 @@ const RangeFind = Class("RangeFind", { let doc = range.startContainer.ownerDocument; let win = doc.defaultView; let ranges = this.ranges.filter(function (r) - r.window == win && RangeFind.contains(r.range, range)); + r.window === win && RangeFind.contains(r.range, range)); if (this.backward) return ranges[ranges.length - 1]; diff --git a/common/content/hints.js b/common/content/hints.js index 11702689..2dfb1944 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -414,7 +414,14 @@ const Hints = Module("hints", { } let str = this.getHintString(hintnum); - hint.span.setAttribute("number", hint.showText ? str + ": " + hint.text.substr(0, 50) : str); + let prefix = ""; + if (hint.elem instanceof HTMLInputElement) + if (hint.elem.type === "radio") + prefix = hint.elem.checked ? "⊙ " : "○ "; + else if (hint.elem.type === "checkbox") + prefix = hint.elem.checked ? "☑ " : "☐ "; + + hint.span.setAttribute("number", str + (hint.showText ? ": " + prefix + hint.text.substr(0, 50) : "")); if (hint.imgSpan) hint.imgSpan.setAttribute("number", str); else @@ -521,6 +528,8 @@ const Hints = Module("hints", { dactyl.trapErrors(this._hintMode.action, this._hintMode, elem, elem.href || elem.src || "", this._extendedhintCount, top); + if (this._continue && this._top) + this._showHints(); }, timeout); return true; }, diff --git a/common/locale/en-US/tabs.xml b/common/locale/en-US/tabs.xml index 2e7a9bfc..c84a89f8 100644 --- a/common/locale/en-US/tabs.xml +++ b/common/locale/en-US/tabs.xml @@ -324,16 +324,18 @@ D + countD - + Like d but selects the tab to the left of the deleted tabs after deletion. :tabo :tabonly + :tabonly - + Close all buffers other than the currently visible tab.
Like d but selects the tab to the left of the deleted tabs after deletion.
Close all buffers other than the currently visible tab.