alex/yomichan
1
Fork 0
Code Releases Activity

Add support for middle clicks opening new tabs on the context buttons

Browse Source
This commit is contained in:
toasted-nutbread 2019-10-19 22:30:16 -04:00
parent dbec4bffda
commit d9ae34821c
4 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ext/bg/js/api.js
View File

@ -144,28 +144,30 @@ async function apiTemplateRender(template, data, dynamic) {
} }
} }
async function apiCommandExec(command) { async function apiCommandExec(command, params) {
const handlers = apiCommandExec.handlers; const handlers = apiCommandExec.handlers;
if (handlers.hasOwnProperty(command)) { if (handlers.hasOwnProperty(command)) {
const handler = handlers[command]; const handler = handlers[command];
handler(); handler(params);
} }
} }
apiCommandExec.handlers = { apiCommandExec.handlers = {
search: async () => { search: async (params) => {
const url = chrome.extension.getURL('/bg/search.html'); const url = chrome.extension.getURL('/bg/search.html');
try { if (!(params && params.newTab)) {
const tab = await apiFindTab(1000, (url2) => ( try {
url2 !== null && const tab = await apiFindTab(1000, (url2) => (
url2.startsWith(url) && url2 !== null &&
(url2.length === url.length || url2[url.length] === '?' || url2[url.length] === '#') url2.startsWith(url) &&
)); (url2.length === url.length || url2[url.length] === '?' || url2[url.length] === '#')
if (tab !== null) { ));
await apiFocusTab(tab); if (tab !== null) {
return; await apiFocusTab(tab);
return;
}
} catch (e) {
// NOP
} }
} catch (e) {
// NOP
} }
chrome.tabs.create({url}); chrome.tabs.create({url});
}, },

2
ext/bg/js/backend.js
View File

@ -181,7 +181,7 @@ Backend.messageHandlers = {
definitionsAddable: ({definitions, modes, optionsContext}) => apiDefinitionsAddable(definitions, modes, optionsContext), definitionsAddable: ({definitions, modes, optionsContext}) => apiDefinitionsAddable(definitions, modes, optionsContext),
noteView: ({noteId}) => apiNoteView(noteId), noteView: ({noteId}) => apiNoteView(noteId),
templateRender: ({template, data, dynamic}) => apiTemplateRender(template, data, dynamic), templateRender: ({template, data, dynamic}) => apiTemplateRender(template, data, dynamic),
commandExec: ({command}) => apiCommandExec(command), commandExec: ({command, params}) => apiCommandExec(command, params),
audioGetUrl: ({definition, source, optionsContext}) => apiAudioGetUrl(definition, source, optionsContext), audioGetUrl: ({definition, source, optionsContext}) => apiAudioGetUrl(definition, source, optionsContext),
screenshotGet: ({options}, sender) => apiScreenshotGet(options, sender), screenshotGet: ({options}, sender) => apiScreenshotGet(options, sender),
forward: ({action, params}, sender) => apiForward(action, params, sender), forward: ({action, params}, sender) => apiForward(action, params, sender),

20
ext/bg/js/context.js
View File

@ -25,6 +25,20 @@ function showExtensionInfo() {
node.textContent = `${manifest.name} v${manifest.version}`; node.textContent = `${manifest.name} v${manifest.version}`;
} }
function setupButtonEvents(selector, command) {
$(selector)
.on('click', (e) => {
if (e.button !== 0) { return; }
apiCommandExec(command, {newTab: e.ctrlKey});
e.preventDefault();
})
.on('auxclick', (e) => {
if (e.button !== 1) { return; }
apiCommandExec(command, {newTab: true});
e.preventDefault();
});
}
$(document).ready(utilAsync(() => { $(document).ready(utilAsync(() => {
showExtensionInfo(); showExtensionInfo();
@ -33,9 +47,9 @@ $(document).ready(utilAsync(() => {
document.documentElement.dataset.mode = (browser === 'firefox-mobile' ? 'full' : 'mini'); document.documentElement.dataset.mode = (browser === 'firefox-mobile' ? 'full' : 'mini');
}); });
$('.action-open-search').click(() => apiCommandExec('search')); setupButtonEvents('.action-open-search', 'search');
$('.action-open-options').click(() => apiCommandExec('options')); setupButtonEvents('.action-open-options', 'options');
$('.action-open-help').click(() => apiCommandExec('help')); setupButtonEvents('.action-open-help', 'help');
const optionsContext = { const optionsContext = {
depth: 0, depth: 0,

4
ext/fg/js/api.js
View File

@ -49,8 +49,8 @@ function apiAudioGetUrl(definition, source, optionsContext) {
return utilInvoke('audioGetUrl', {definition, source, optionsContext}); return utilInvoke('audioGetUrl', {definition, source, optionsContext});
} }
function apiCommandExec(command) { function apiCommandExec(command, params) {
return utilInvoke('commandExec', {command}); return utilInvoke('commandExec', {command, params});
} }
function apiScreenshotGet(options) { function apiScreenshotGet(options) {