diff options
| author | Alex Yatskov <FooSoft@users.noreply.github.com> | 2019-10-20 11:06:23 -0700 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-20 11:06:23 -0700 | 
| commit | d8f9c2e1d43a7c37103d7f9a58039bffa4aac495 (patch) | |
| tree | dca6abf8ef84eb8cc714ad1f5e78a24a6dbaa21c /ext/bg/js/api.js | |
| parent | 65923238556212fef2d7ed7a156373c88382ffd2 (diff) | |
| parent | 362a1ed9e4621c47b4dca99777015b90fc90451c (diff) | |
Merge pull request #261 from toasted-nutbread/search-button-reuse-tab
Reuse open search tab when clicking search button
Diffstat (limited to 'ext/bg/js/api.js')
| -rw-r--r-- | ext/bg/js/api.js | 115 | 
1 files changed, 109 insertions, 6 deletions
| diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js index da5ae4fe..93d9c155 100644 --- a/ext/bg/js/api.js +++ b/ext/bg/js/api.js @@ -144,24 +144,46 @@ async function apiTemplateRender(template, data, dynamic) {      }  } -async function apiCommandExec(command) { +async function apiCommandExec(command, params) {      const handlers = apiCommandExec.handlers;      if (handlers.hasOwnProperty(command)) {          const handler = handlers[command]; -        handler(); +        handler(params);      }  }  apiCommandExec.handlers = { -    search: () => { -        chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')}); +    search: async (params) => { +        const url = chrome.extension.getURL('/bg/search.html'); +        if (!(params && params.newTab)) { +            try { +                const tab = await apiFindTab(1000, (url2) => ( +                    url2 !== null && +                    url2.startsWith(url) && +                    (url2.length === url.length || url2[url.length] === '?' || url2[url.length] === '#') +                )); +                if (tab !== null) { +                    await apiFocusTab(tab); +                    return; +                } +            } catch (e) { +                // NOP +            } +        } +        chrome.tabs.create({url});      },      help: () => {          chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});      }, -    options: () => { -        chrome.runtime.openOptionsPage(); +    options: (params) => { +        if (!(params && params.newTab)) { +            chrome.runtime.openOptionsPage(); +        } else { +            const manifest = chrome.runtime.getManifest(); +            const url = chrome.extension.getURL(manifest.options_ui.page); +            chrome.tabs.create({url}); +        }      },      toggle: async () => { @@ -298,3 +320,84 @@ async function apiGetBrowser() {          return 'chrome';      }  } + +function apiGetTabUrl(tab) { +    return new Promise((resolve) => { +        chrome.tabs.sendMessage(tab.id, {action: 'getUrl'}, {frameId: 0}, (response) => { +            let url = null; +            if (!chrome.runtime.lastError) { +                url = (response !== null && typeof response === 'object' && !Array.isArray(response) ? response.url : null); +                if (url !== null && typeof url !== 'string') { +                    url = null; +                } +            } +            resolve({tab, url}); +        }); +    }); +} + +async function apiFindTab(timeout, checkUrl) { +    // This function works around the need to have the "tabs" permission to access tab.url. +    const tabs = await new Promise((resolve) => chrome.tabs.query({}, resolve)); +    let matchPromiseResolve = null; +    const matchPromise = new Promise((resolve) => { matchPromiseResolve = resolve; }); + +    const checkTabUrl = ({tab, url}) => { +        if (checkUrl(url, tab)) { +            matchPromiseResolve(tab); +        } +    }; + +    const promises = []; +    for (const tab of tabs) { +        const promise = apiGetTabUrl(tab); +        promise.then(checkTabUrl); +        promises.push(promise); +    } + +    const racePromises = [ +        matchPromise, +        Promise.all(promises).then(() => null) +    ]; +    if (typeof timeout === 'number') { +        racePromises.push(new Promise((resolve) => setTimeout(() => resolve(null), timeout))); +    } + +    return await Promise.race(racePromises); +} + +async function apiFocusTab(tab) { +    await new Promise((resolve, reject) => { +        chrome.tabs.update(tab.id, {active: true}, () => { +            const e = chrome.runtime.lastError; +            if (e) { reject(e); } +            else { resolve(); } +        }); +    }); + +    if (!(typeof chrome.windows === 'object' && chrome.windows !== null)) { +        // Windows not supported (e.g. on Firefox mobile) +        return; +    } + +    try { +        const tabWindow = await new Promise((resolve) => { +            chrome.windows.get(tab.windowId, {}, (tabWindow) => { +                const e = chrome.runtime.lastError; +                if (e) { reject(e); } +                else { resolve(tabWindow); } +            }); +        }); +        if (!tabWindow.focused) { +            await new Promise((resolve, reject) => { +                chrome.windows.update(tab.windowId, {focused: true}, () => { +                    const e = chrome.runtime.lastError; +                    if (e) { reject(e); } +                    else { resolve(); } +                }); +            }); +        } +    } catch (e) { +        // Edge throws exception for no reason here. +    } +} |