diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-08-30 09:27:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 09:27:55 +0800 |
| commit | 791e80988d889a72fee12579fa6525b6b0f15e18 (patch) | |
| tree | dedc156a42acb9419a7eba8decbcad98cc9cb59a /app/scripts/lib | |
| parent | a9c738d4d3226f61942641a41c399c75a3e9eb3e (diff) | |
| parent | c15eef9425531c86a9016d1cbad9d32f4d12edcd (diff) | |
| download | tangerine-wallet-browser-791e80988d889a72fee12579fa6525b6b0f15e18.tar tangerine-wallet-browser-791e80988d889a72fee12579fa6525b6b0f15e18.tar.gz tangerine-wallet-browser-791e80988d889a72fee12579fa6525b6b0f15e18.tar.bz2 tangerine-wallet-browser-791e80988d889a72fee12579fa6525b6b0f15e18.tar.lz tangerine-wallet-browser-791e80988d889a72fee12579fa6525b6b0f15e18.tar.xz tangerine-wallet-browser-791e80988d889a72fee12579fa6525b6b0f15e18.tar.zst tangerine-wallet-browser-791e80988d889a72fee12579fa6525b6b0f15e18.zip | |
Merge pull request #596 from MetaMask/EdgeCompatibility
Edge compatibility
Diffstat (limited to 'app/scripts/lib')
| -rw-r--r-- | app/scripts/lib/extension-instance.js | 15 | ||||
| -rw-r--r-- | app/scripts/lib/notifications.js | 3 |
2 files changed, 15 insertions, 3 deletions
diff --git a/app/scripts/lib/extension-instance.js b/app/scripts/lib/extension-instance.js index 1098130e3..628b62e3f 100644 --- a/app/scripts/lib/extension-instance.js +++ b/app/scripts/lib/extension-instance.js @@ -46,12 +46,23 @@ function Extension () { _this[api] = browser[api] } } catch (e) {} - try { _this.api = browser.extension[api] } catch (e) {} - }) + + try { + if (browser && browser.runtime) { + this.runtime = browser.runtime + } + } catch (e) {} + + try { + if (browser && browser.browserAction) { + this.browserAction = browser.browserAction + } + } catch (e) {} + } module.exports = Extension diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index dcb946845..432ad0445 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -14,9 +14,10 @@ function show () { return extension.windows.update(popup.id, { focused: true }) } + extension.windows.create({ url: 'notification.html', - type: 'detached_panel', + type: 'popup', focused: true, width: 360, height: 500, |