From cf0c5cf5cbb291eb4023ca232938bbfcfa1b75a3 Mon Sep 17 00:00:00 2001 From: ayn2op Date: Sun, 17 Mar 2024 00:18:20 +0530 Subject: [PATCH 01/10] Add .vscode to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8b7196463..86df460aa 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ dist jscoverage.json tags .cake_task_cache + +# Visual Studio Code +.vscode/ \ No newline at end of file From 231379c2196403a9087dd652cc01c47111c5cf4b Mon Sep 17 00:00:00 2001 From: ayn2op Date: Sun, 17 Mar 2024 00:29:46 +0530 Subject: [PATCH 02/10] Search using browser default engine --- background_scripts/main.js | 4 ++++ manifest.json | 3 ++- pages/vomnibar.js | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/background_scripts/main.js b/background_scripts/main.js index a5c0e8513..406e2b5e8 100644 --- a/background_scripts/main.js +++ b/background_scripts/main.js @@ -542,6 +542,10 @@ const sendRequestHandlers = { }); }, + launch({ query, openInNewTab }) { + chrome.search.query({ disposition: openInNewTab ? "NEW_TAB" : "CURRENT_TAB", text: query }); + }, + domReady(_, sender) { const isTopFrame = sender.frameId == 0; if (!isTopFrame) return; diff --git a/manifest.json b/manifest.json index 95a59a7f6..69983c820 100644 --- a/manifest.json +++ b/manifest.json @@ -30,7 +30,8 @@ // loads. This permission was required when moving to manifest V3. "scripting", "favicon", // The favicon permission is not yet supported by Firefox. - "webNavigation" + "webNavigation", + "search" ], "content_scripts": [ { diff --git a/pages/vomnibar.js b/pages/vomnibar.js index 5f8be2357..3c9df572f 100644 --- a/pages/vomnibar.js +++ b/pages/vomnibar.js @@ -235,7 +235,11 @@ class VomnibarUI { if (isPrimarySearchSuggestion(firstCompletion)) { query = UrlUtils.createSearchUrl(query, firstCompletion?.searchUrl); } - this.hide(() => this.launchUrl(query, openInNewTab)); + this.hide(() => chrome.runtime.sendMessage({ + handler: "launch", + query, + openInNewTab, + })); } else if (isPrimarySearchSuggestion(completion)) { query = UrlUtils.createSearchUrl(query, completion.searchUrl); this.hide(() => this.launchUrl(query, openInNewTab)); From e79e4875ef7939eadb7d58d9cb8aab454d6505a5 Mon Sep 17 00:00:00 2001 From: ayn2op Date: Sun, 17 Mar 2024 00:30:12 +0530 Subject: [PATCH 03/10] Remove default search engine option --- lib/url_utils.js | 7 ++----- pages/options.html | 12 ------------ 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/lib/url_utils.js b/lib/url_utils.js index 487e1ff82..30af89a6d 100644 --- a/lib/url_utils.js +++ b/lib/url_utils.js @@ -126,12 +126,9 @@ const UrlUtils = { }, // Create a search URL from the given :query (using either the provided search URL, or the default - // one). It would be better to pull the default search engine from Chrome itself. However, Chrome - // does not provide an API for doing so. + // one). createSearchUrl(query, searchUrl) { - if (searchUrl == null) { - searchUrl = Settings.get("searchUrl") || Settings.defaultOptions.defaultSearchUrl; - } + if (!searchUrl) return; if (!["%s", "%S"].some((token) => searchUrl.indexOf(token) >= 0)) { searchUrl += "%s"; } diff --git a/pages/options.html b/pages/options.html index 9562e9eb4..905a3ec89 100644 --- a/pages/options.html +++ b/pages/options.html @@ -232,18 +232,6 @@ - - Default search
engine - -
-
- The search engine to use in the Vomnibar
(e.g.: "https://duckduckgo.com/?q="). -
-
- -
Reset
- - Previous patterns From 49b39b183bd56d87e403a8ecba56e9141783b2ad Mon Sep 17 00:00:00 2001 From: ayn2op Date: Thu, 28 Mar 2024 16:09:12 +0530 Subject: [PATCH 04/10] Remove .vscode entry from .gitignore --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 86df460aa..061529dcf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,4 @@ node_modules/* dist jscoverage.json tags -.cake_task_cache - -# Visual Studio Code -.vscode/ \ No newline at end of file +.cake_task_cache \ No newline at end of file From cddfbd1262515bb880cefb4ebdb6063c2317f3c9 Mon Sep 17 00:00:00 2001 From: Phil Crosby Date: Wed, 10 Apr 2024 18:19:26 -0700 Subject: [PATCH 05/10] Clean up gitignore: only ignore ignorable files specific to Vimium --- .gitignore | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 061529dcf..53c37a166 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1 @@ -*.un~ -*.swo -*.swp -*.crx -*.sublime* -options/*.js -node_modules/* -dist -jscoverage.json -tags -.cake_task_cache \ No newline at end of file +dist \ No newline at end of file From bfe6dc53b4d6820515fc5684ad46bcaca30874d2 Mon Sep 17 00:00:00 2001 From: Phil Crosby Date: Wed, 10 Apr 2024 18:50:03 -0700 Subject: [PATCH 06/10] Fix error when loading options now that searchUrl has been removed --- pages/options.js | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/options.js b/pages/options.js index fea5c592f..2b368d8c6 100644 --- a/pages/options.js +++ b/pages/options.js @@ -14,7 +14,6 @@ const options = { smoothScroll: "boolean", grabBackFocus: "boolean", searchEngines: "string", - searchUrl: "string", settingsVersion: "string", // This is a hidden field. userDefinedLinkHintCss: "string", }; From 0fec0888f20c3104a5196c774faa1d043106f560 Mon Sep 17 00:00:00 2001 From: Phil Crosby Date: Wed, 10 Apr 2024 18:50:43 -0700 Subject: [PATCH 07/10] Fix custom search behavior when no entry is selected This is a regression from 231379c2196403a9087dd652cc01c47111c5cf4b. Also improve some function names and comments. --- background_scripts/main.js | 5 +++-- lib/url_utils.js | 16 +++++++++------- pages/vomnibar.js | 17 +++++++++++------ tests/unit_tests/url_utils_test.js | 13 ------------- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/background_scripts/main.js b/background_scripts/main.js index 406e2b5e8..6ca997f3d 100644 --- a/background_scripts/main.js +++ b/background_scripts/main.js @@ -542,8 +542,9 @@ const sendRequestHandlers = { }); }, - launch({ query, openInNewTab }) { - chrome.search.query({ disposition: openInNewTab ? "NEW_TAB" : "CURRENT_TAB", text: query }); + launchSearchQuery({ query, openInNewTab }) { + const disposition = openInNewTab ? "NEW_TAB" : "CURRENT_TAB"; + chrome.search.query({ disposition, text: query }); }, domReady(_, sender) { diff --git a/lib/url_utils.js b/lib/url_utils.js index 30af89a6d..16aa1da9a 100644 --- a/lib/url_utils.js +++ b/lib/url_utils.js @@ -85,8 +85,8 @@ const UrlUtils = { return false; }, - // Converts :string into a Google search if it's not already a URL. We don't bother with escaping - // characters as Chrome will do that for us. + // Converts string into a full URL if it's not already one. We don't escape characters as the + // browser will do that for us. async convertToUrl(string) { string = string.trim(); @@ -98,7 +98,9 @@ const UrlUtils = { } else if (await this.isUrl(string)) { return this.createFullUrl(string); } else { - return this.createSearchUrl(string); + const message = `convertToUrl: can't convert "${string}" into a URL. This shouldn't happen.`; + console.error(message); + return null; } }, @@ -125,10 +127,8 @@ const UrlUtils = { } }, - // Create a search URL from the given :query (using either the provided search URL, or the default - // one). + // Create a search URL from the given :query using the provided search URL. createSearchUrl(query, searchUrl) { - if (!searchUrl) return; if (!["%s", "%S"].some((token) => searchUrl.indexOf(token) >= 0)) { searchUrl += "%s"; } @@ -139,7 +139,9 @@ const UrlUtils = { // Map a search query to its URL encoded form. The query may be either a string or an array of // strings. E.g. "BBC Sport" -> "BBC%20Sport". createSearchQuery(query) { - if (typeof query === "string") query = query.split(/\s+/); + if (typeof query === "string") { + query = query.split(/\s+/); + } return query.map(encodeURIComponent).join("%20"); }, }; diff --git a/pages/vomnibar.js b/pages/vomnibar.js index 3c9df572f..4a6e0e370 100644 --- a/pages/vomnibar.js +++ b/pages/vomnibar.js @@ -232,14 +232,19 @@ class VomnibarUI { // on an empty query is a no-op. if (query.length == 0) return; const firstCompletion = this.completions[0]; + const isPrimary = isPrimarySearchSuggestion(firstCompletion); if (isPrimarySearchSuggestion(firstCompletion)) { - query = UrlUtils.createSearchUrl(query, firstCompletion?.searchUrl); + query = UrlUtils.createSearchUrl(query, firstCompletion.searchUrl); + this.launchUrl(query); + } else { + this.hide(() => + chrome.runtime.sendMessage({ + handler: "launchSearchQuery", + query, + openInNewTab, + }) + ); } - this.hide(() => chrome.runtime.sendMessage({ - handler: "launch", - query, - openInNewTab, - })); } else if (isPrimarySearchSuggestion(completion)) { query = UrlUtils.createSearchUrl(query, completion.searchUrl); this.hide(() => this.launchUrl(query, openInNewTab)); diff --git a/tests/unit_tests/url_utils_test.js b/tests/unit_tests/url_utils_test.js index 587b5e0b1..587dffc31 100644 --- a/tests/unit_tests/url_utils_test.js +++ b/tests/unit_tests/url_utils_test.js @@ -60,19 +60,6 @@ context("convertToUrl", async () => { await UrlUtils.convertToUrl("javascript:alert('25 % 20 * 25%20');"), ); }); - - should("convert non-URL terms into search queries", async () => { - await Settings.load(); - assert.equal("https://www.google.com/search?q=google", await UrlUtils.convertToUrl("google")); - assert.equal( - "https://www.google.com/search?q=go%20ogle.com", - await UrlUtils.convertToUrl("go ogle.com"), - ); - assert.equal( - "https://www.google.com/search?q=%40twitter", - await UrlUtils.convertToUrl("@twitter"), - ); - }); }); context("createSearchUrl", () => { From 13b2bc97c16d3d1c3ba7aeb62acc3c962742c8ce Mon Sep 17 00:00:00 2001 From: Julian Diehl Date: Thu, 28 Sep 2023 13:20:10 +0200 Subject: [PATCH 08/10] Vimium is now using top z-index layer --- content_scripts/link_hints.js | 44 ++++++++++++++--------------------- content_scripts/vimium.css | 20 ++++++++-------- lib/dom_utils.js | 3 ++- 3 files changed, 29 insertions(+), 38 deletions(-) diff --git a/content_scripts/link_hints.js b/content_scripts/link_hints.js index 80ba3a792..2e514b821 100644 --- a/content_scripts/link_hints.js +++ b/content_scripts/link_hints.js @@ -379,7 +379,7 @@ class LinkHintsMode { this.stableSortCount = 0; this.hintMarkers = hintDescriptors.map((desc) => this.createMarkerFor(desc)); this.markerMatcher = Settings.get("filterLinkHints") ? new FilterHints() : new AlphabetHints(); - this.markerMatcher.fillInMarkers(this.hintMarkers, this.getNextZIndex.bind(this)); + this.markerMatcher.fillInMarkers(this.hintMarkers); this.hintMode = new Mode(); this.hintMode.init({ @@ -402,11 +402,16 @@ class LinkHintsMode { } }); + this.renderHints(); + this.setIndicator(); + } + + renderHints() { // Append these markers as top level children instead of as child nodes to the link itself, // because some clickable elements cannot contain children, e.g. submit buttons. this.hintMarkerContainingDiv = DomUtils.addElementsToPage( this.hintMarkers.filter((m) => m.isLocalMarker()).map((m) => m.element), - { id: "vimiumHintMarkerContainer", className: "vimiumReset" }, + { id: "vimiumHintMarkerContainer", className: "vimiumReset" } ); // TODO(philc): 2024-03-27 Remove this hasPopoverSupport check once Firefox has popover support. @@ -431,16 +436,6 @@ class LinkHintsMode { this.setIndicator(); } - // Increments and returns the Z index that should be used for the next hint marker on the page. - getNextZIndex() { - if (this.currentZIndex == null) { - // This is the starting z-index value; it produces z-index values which are greater than all - // of the other z-index values used by Vimium. - this.currentZIndex = 2140000000; - } - return ++this.currentZIndex; - } - setOpenLinkMode(mode, shouldPropagateToOtherFrames) { this.mode = mode; if (shouldPropagateToOtherFrames == null) { @@ -476,7 +471,6 @@ class LinkHintsMode { el.style.left = localHint.rect.left + "px"; el.style.top = localHint.rect.top + "px"; // Each hint marker is assigned a different z-index. - el.style.zIndex = this.getNextZIndex(); el.className = "vimiumReset internalVimiumHintMarker vimiumHintMarker"; Object.assign(marker, { element: el, @@ -589,7 +583,6 @@ class LinkHintsMode { const { linksMatched, userMightOverType } = this.markerMatcher.getMatchingHints( this.hintMarkers, tabCount, - this.getNextZIndex.bind(this), ); if (linksMatched.length === 0) { this.deactivateMode(); @@ -622,7 +615,6 @@ class LinkHintsMode { const localHintMarkers = this.hintMarkers.filter((m) => m.isLocalMarker() && (m.element.style.display !== "none") ); - // Fill in the markers' rects, if necessary. for (const marker of localHintMarkers) { if (marker.markerRect == null) { @@ -659,17 +651,16 @@ class LinkHintsMode { } } - // Rotate the z-indexes within each stack. - for (const stack of stacks) { + const newMarkers = [] + for (let stack of stacks) { if (stack.length > 1) { - const zIndexes = stack.map((marker) => marker.element.style.zIndex); - zIndexes.push(zIndexes[0]); - for (let index = 0; index < stack.length; index++) { - const marker = stack[index]; - marker.element.style.zIndex = zIndexes[index + 1]; - } + // Push the last element to the beginning. + stack = stack.splice(-1, 1).concat(stack) } + newMarkers.push(...stack) } + this.hintMarkers = newMarkers; + this.renderHints(); } // When only one hint remains, activate it in the appropriate way. The current frame may or may @@ -877,7 +868,7 @@ class FilterHints { marker.element.innerHTML = spanWrap(caption); } - fillInMarkers(hintMarkers, getNextZIndex) { + fillInMarkers(hintMarkers) { for (const marker of hintMarkers) { if (marker.isLocalMarker()) { this.renderMarker(marker); @@ -886,10 +877,10 @@ class FilterHints { // We use getMatchingHints() here (although we know that all of the hints will match) to get an // order on the hints and highlight the first one. - return this.getMatchingHints(hintMarkers, 0, getNextZIndex); + return this.getMatchingHints(hintMarkers, 0); } - getMatchingHints(hintMarkers, tabCount, getNextZIndex) { + getMatchingHints(hintMarkers, tabCount) { // At this point, linkTextKeystrokeQueue and hintKeystrokeQueue have been updated to reflect the // latest input. Use them to filter the link hints accordingly. const matchString = this.hintKeystrokeQueue.join(""); @@ -910,7 +901,6 @@ class FilterHints { if (this.activeHintMarker?.element) { this.activeHintMarker.element.classList.add("vimiumActiveHintMarker"); - this.activeHintMarker.element.style.zIndex = getNextZIndex(); } return { diff --git a/content_scripts/vimium.css b/content_scripts/vimium.css index 439a99fec..57ce18090 100644 --- a/content_scripts/vimium.css +++ b/content_scripts/vimium.css @@ -3,10 +3,9 @@ * don't use the same CSS class names that the page is using, so the page's CSS doesn't mess with * the style of our Vimium dialogs. * - * The z-indexes of Vimium elements are very large, because we always want them to show on top. We - * know that Chrome supports z-index values up to about 2^31. The values we use are large numbers - * approaching that bound. However, we must leave headroom for link hints. Hint marker z-indexes - * start at 2140000001. + * We use the maximum z-index value for all Vimium elements to guarantee that they always appear on + * top. Chrome supports z-index values up to 2,147,483,647 (= 2^31 - 1). We utilize the maximum + * z-index value allowable to ensure Vimium elements have precedence over all other page elements. */ /* @@ -60,7 +59,7 @@ tr.vimiumReset { vertical-align: baseline; white-space: normal; width: auto; - z-index: 2140000000; /* Vimium's reference z-index value. */ + z-index: 2147483647; } thead.vimiumReset, tbody.vimiumReset { @@ -90,6 +89,7 @@ div.internalVimiumHintMarker { border: solid 1px #C38A22; border-radius: 3px; box-shadow: 0px 3px 7px 0px rgba(0, 0, 0, 0.3); + z-index: 2147483647; } div.internalVimiumHintMarker span { @@ -153,7 +153,7 @@ iframe.vimiumHelpDialogFrame { display: block; position: fixed; border: none; - z-index: 2139999997; /* Three less than the reference value. */ + z-index: 2147483647; } div#vimiumHelpDialogContainer { @@ -320,7 +320,7 @@ div.vimiumHUD { border-radius: 4px; box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.8); border: 1px solid #aaa; - z-index: 2139999999; + z-index: 2147483647; } iframe.vimiumHUDFrame { @@ -336,7 +336,7 @@ iframe.vimiumHUDFrame { right: 20px; margin: 0 0 0 -40%; border: none; - z-index: 2139999998; /* Two less than the reference value. */ + z-index: 2147483647; opacity: 0; } @@ -413,7 +413,7 @@ iframe.vomnibarFrame { margin: 0 0 0 -40%; border: none; font-family: sans-serif; - z-index: 2139999998; /* Two less than the reference value. */ + z-index: 2147483647; } div.vimiumFlash { @@ -421,7 +421,7 @@ div.vimiumFlash { padding: 1px; background-color: transparent; position: absolute; - z-index: 2140000000; + z-index: 2147483647; } /* UIComponent CSS */ diff --git a/lib/dom_utils.js b/lib/dom_utils.js index 99d85ee61..d76e34277 100644 --- a/lib/dom_utils.js +++ b/lib/dom_utils.js @@ -86,7 +86,8 @@ const DomUtils = { // Note that adding these nodes all at once (via a parent div) is significantly faster than // one-by-one. addElementsToPage(elements, containerOptions) { - const parent = this.createElement("div"); + // Don't create a new container if we already have one. + const parent = document.getElementById(containerOptions.id) || this.createElement("div"); if (containerOptions.id != null) parent.id = containerOptions.id; if (containerOptions.className != null) parent.className = containerOptions.className; for (const el of elements) parent.appendChild(el); From 8f3097eb2d538c8e6ca4d2cf38fce84d2cbc9788 Mon Sep 17 00:00:00 2001 From: Phil Crosby Date: Wed, 10 Apr 2024 20:00:54 -0700 Subject: [PATCH 09/10] Remove util fn addElementsToPage, and rename refactors This utils function wasn't pulling its weight. --- content_scripts/link_hints.js | 32 ++++++++++++++++++++------------ content_scripts/mode_normal.js | 14 +++++++++----- lib/dom_utils.js | 16 ---------------- tests/dom_tests/dom_tests.js | 4 ++-- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/content_scripts/link_hints.js b/content_scripts/link_hints.js index 2e514b821..b2e49484d 100644 --- a/content_scripts/link_hints.js +++ b/content_scripts/link_hints.js @@ -361,7 +361,7 @@ class LinkHintsMode { // We need documentElement to be ready in order to append links. if (!document.documentElement) return; - this.hintMarkerContainingDiv = null; + this.containerEl = null; // Function that does the appropriate action on the selected link. this.linkActivator = undefined; // The link-hints "mode" (in the key-handler, indicator sense). @@ -407,20 +407,28 @@ class LinkHintsMode { } renderHints() { + if (this.containerEl == null) { + const div = DomUtils.createElement("div"); + div.id = "vimiumHintMarkerContainer"; + div.className = "vimiumReset"; + this.containerEl = div; + document.documentElement.appendChild(div); + } + // Append these markers as top level children instead of as child nodes to the link itself, // because some clickable elements cannot contain children, e.g. submit buttons. - this.hintMarkerContainingDiv = DomUtils.addElementsToPage( - this.hintMarkers.filter((m) => m.isLocalMarker()).map((m) => m.element), - { id: "vimiumHintMarkerContainer", className: "vimiumReset" } - ); + const markerEls = this.hintMarkers.filter((m) => m.isLocalMarker()).map((m) => m.element); + for (const el of markerEls) { + this.containerEl.appendChild(el); + } // TODO(philc): 2024-03-27 Remove this hasPopoverSupport check once Firefox has popover support. // Also move this CSS into vimium.css. - const hasPopoverSupport = this.hintMarkerContainingDiv.showPopover != null; + const hasPopoverSupport = this.containerEl.showPopover != null; if (hasPopoverSupport) { - this.hintMarkerContainingDiv.popover = "manual"; - this.hintMarkerContainingDiv.showPopover(); - Object.assign(this.hintMarkerContainingDiv.style, { + this.containerEl.popover = "manual"; + this.containerEl.showPopover(); + Object.assign(this.containerEl.style, { top: 0, left: 0, position: "absolute", @@ -762,10 +770,10 @@ class LinkHintsMode { } removeHintMarkers() { - if (this.hintMarkerContainingDiv) { - DomUtils.removeElement(this.hintMarkerContainingDiv); + if (this.containerEl) { + DomUtils.removeElement(this.containerEl); } - this.hintMarkerContainingDiv = null; + this.containerEl = null; } } diff --git a/content_scripts/mode_normal.js b/content_scripts/mode_normal.js index dc82415a4..460bcee0b 100644 --- a/content_scripts/mode_normal.js +++ b/content_scripts/mode_normal.js @@ -509,10 +509,14 @@ class FocusSelector extends Mode { }, }); - this.hintContainingDiv = DomUtils.addElementsToPage(hints, { - id: "vimiumInputMarkerContainer", - className: "vimiumReset", - }); + const div = DomUtils.createElement("div"); + div.id = "vimiumInputMarkerContainer"; + div.className = "vimiumReset"; + for (const el of hints) { + div.appendChild(el); + } + this.hintContainerEl = div; + document.documentElement.appendChild(div); DomUtils.simulateSelect(visibleInputs[selectedInputIndex].element); if (visibleInputs.length === 1) { @@ -525,7 +529,7 @@ class FocusSelector extends Mode { exit() { super.exit(); - DomUtils.removeElement(this.hintContainingDiv); + DomUtils.removeElement(this.hintContainerEl); if (document.activeElement && DomUtils.isEditable(document.activeElement)) { return new InsertMode({ singleton: "post-find-mode/focus-input", diff --git a/lib/dom_utils.js b/lib/dom_utils.js index d76e34277..c393822b0 100644 --- a/lib/dom_utils.js +++ b/lib/dom_utils.js @@ -79,22 +79,6 @@ const DomUtils = { } }, - // - // Adds a list of elements to a new container div, and adds that to the page. - // Returns the container div. - // - // Note that adding these nodes all at once (via a parent div) is significantly faster than - // one-by-one. - addElementsToPage(elements, containerOptions) { - // Don't create a new container if we already have one. - const parent = document.getElementById(containerOptions.id) || this.createElement("div"); - if (containerOptions.id != null) parent.id = containerOptions.id; - if (containerOptions.className != null) parent.className = containerOptions.className; - for (const el of elements) parent.appendChild(el); - document.documentElement.appendChild(parent); - return parent; - }, - // // Remove an element from its DOM tree. // diff --git a/tests/dom_tests/dom_tests.js b/tests/dom_tests/dom_tests.js index 9d9c2453d..9796a9a88 100644 --- a/tests/dom_tests/dom_tests.js +++ b/tests/dom_tests/dom_tests.js @@ -72,9 +72,9 @@ const createGeneralHintTests = (isFilteredMode) => { should("create hints when activated, discard them when deactivated", () => { const mode = activateLinkHintsMode(); - assert.isFalse(mode.hintMarkerContainingDiv == null); + assert.isFalse(mode.containerEl == null); mode.deactivateMode(); - assert.isTrue(mode.hintMarkerContainingDiv == null); + assert.isTrue(mode.containerEl == null); }); should("position items correctly", () => { From 445486e20f410fcfbbe8b0a186242bc9f4368511 Mon Sep 17 00:00:00 2001 From: hugehope Date: Thu, 11 Apr 2024 15:28:00 +0800 Subject: [PATCH 10/10] chore: remove repetitive words Signed-off-by: hugehope --- content_scripts/link_hints.js | 2 +- pages/completion_engines.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content_scripts/link_hints.js b/content_scripts/link_hints.js index b2e49484d..d621a08d0 100644 --- a/content_scripts/link_hints.js +++ b/content_scripts/link_hints.js @@ -925,7 +925,7 @@ class FilterHints { (keyChar.toLowerCase() !== keyChar) && (this.linkHintNumbers.toLowerCase() !== this.linkHintNumbers.toUpperCase()) ) { - // The the keyChar is upper case and the link hint "numbers" contain characters (e.g. + // The keyChar is upper case and the link hint "numbers" contain characters (e.g. // [a-zA-Z]). We don't want some upper-case letters matching hints (above) and some matching // text (below), so we ignore such keys. return; diff --git a/pages/completion_engines.html b/pages/completion_engines.html index d55d06169..f4b181202 100644 --- a/pages/completion_engines.html +++ b/pages/completion_engines.html @@ -46,7 +46,7 @@

Available Completion Engines

- Search completion is available in this version of Vimium for the the following custom search engines. + Search completion is available in this version of Vimium for the following custom search engines.