X-Git-Url: https://git.r.bdr.sh/rbdr/junction/blobdiff_plain/ac259c8645783dcb92fc0eafff166769f5216aa9..ad7fccbee23e7ab0348bee23a12401fbc650acd2:/extension/junction.js?ds=inline diff --git a/extension/junction.js b/extension/junction.js index 7de7c28..e78a02b 100644 --- a/extension/junction.js +++ b/extension/junction.js @@ -1,5 +1,6 @@ const internals = { + promisesSupported: !!(window.browser), isInCallState: false, icons: { @@ -26,12 +27,10 @@ const internals = { internals.isInCallState = true; internals.setIcon('hangUp'); - const tabs = await browser.tabs.query({ - currentWindow: true, - active: true - }); + const activeTabs = await internals.getActiveTabs(); - internals.createAudioElement(browser.runtime.getURL('sounds/tada.wav')); + console.log(activeTabs[0].url); // placeholder while we connect backend. + internals.createAudioElement(internals.getRoot().runtime.getURL('sounds/tada.wav')); }, hangUp() { @@ -41,11 +40,12 @@ const internals = { internals.isInCallState = false; }, - createAudioElement(source) { + createAudioElement(source, type = 'audio/wav') { const audioElement = document.createElement('audio'); audioElement.src = source; audioElement.autoplay = 'autoplay'; + audioElement.type = type; document.querySelector('body').appendChild(audioElement); }, @@ -55,10 +55,37 @@ const internals = { setIcon(iconSet) { - browser.browserAction.setIcon({ + internals.getRoot().browserAction.setIcon({ path: internals.icons[iconSet] }); - } + }, + + getRoot() { + + return window.browser || window.chrome; + }, + + // Chrome doesn't yet implement the promise based tabs.query :'( + + getActiveTabs() { + + const query = { + currentWindow: true, + active: true + }; + + if (internals.promisesSupported) { + return internals.getRoot().tabs.query(query); + } + + return new Promise((resolve, reject) => { + + internals.getRoot().tabs.query(query, (tabs) => { + + return resolve(tabs); + }); + }); + }, }; -browser.browserAction.onClicked.addListener(internals.onClick); +internals.getRoot().browserAction.onClicked.addListener(internals.onClick);