From ace6e92d55b32c08b5a0a2b19bdd8974d53aa552 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Mon, 8 Feb 2021 17:52:25 -0500 Subject: Update chrome://extensions/shortcuts URLs to be clickable (#1342) --- ext/bg/js/settings2/settings-display-controller.js | 59 ++++++++++++++++++++++ ext/bg/settings2.html | 4 +- 2 files changed, 61 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/bg/js/settings2/settings-display-controller.js b/ext/bg/js/settings2/settings-display-controller.js index 75c147f2..9d3e5459 100644 --- a/ext/bg/js/settings2/settings-display-controller.js +++ b/ext/bg/js/settings2/settings-display-controller.js @@ -54,6 +54,14 @@ class SettingsDisplayController { node.addEventListener('keydown', onInputTabActionKeyDown, false); } + const onSpecialUrlLinkClick = this._onSpecialUrlLinkClick.bind(this); + const onSpecialUrlLinkMouseDown = this._onSpecialUrlLinkMouseDown.bind(this); + for (const node of document.querySelectorAll('[data-special-url]')) { + node.addEventListener('click', onSpecialUrlLinkClick, false); + node.addEventListener('auxclick', onSpecialUrlLinkClick, false); + node.addEventListener('mousedown', onSpecialUrlLinkMouseDown, false); + } + for (const node of document.querySelectorAll('.defer-load-iframe')) { this._setupDeferLoadIframe(node); } @@ -220,6 +228,57 @@ class SettingsDisplayController { } } + _onSpecialUrlLinkClick(e) { + switch (e.button) { + case 0: + case 1: + e.preventDefault(); + this._createTab(e.currentTarget.dataset.specialUrl, true); + break; + } + } + + _onSpecialUrlLinkMouseDown(e) { + switch (e.button) { + case 0: + case 1: + e.preventDefault(); + break; + } + } + + async _createTab(url, useOpener) { + let openerTabId; + if (useOpener) { + try { + const tab = await new Promise((resolve, reject) => { + chrome.tabs.getCurrent((result) => { + const e = chrome.runtime.lastError; + if (e) { + reject(new Error(e.message)); + } else { + resolve(result); + } + }); + }); + openerTabId = tab.id; + } catch (e) { + // NOP + } + } + + return await new Promise((resolve, reject) => { + chrome.tabs.create({url, openerTabId}, (tab2) => { + const e = chrome.runtime.lastError; + if (e) { + reject(new Error(e.message)); + } else { + resolve(tab2); + } + }); + }); + } + _updateScrollTarget() { const hash = window.location.hash; if (!hash.startsWith('#!')) { return; } diff --git a/ext/bg/settings2.html b/ext/bg/settings2.html index afb7af20..ba862b45 100644 --- a/ext/bg/settings2.html +++ b/ext/bg/settings2.html @@ -3067,12 +3067,12 @@

-- cgit v1.2.3