diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-03-30 02:12:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 02:12:03 +0800 |
| commit | 6f28426a22e0218b3b65e707dd24e4680a3c3548 (patch) | |
| tree | 8a8d3c6790fe9b983533d84f9915dc351f24a004 | |
| parent | 13ec2aaa12537a16e5411b8e1d23845fc648c0d4 (diff) | |
| parent | 98dd684524fde7548442830fe01e1f3e24a6e67d (diff) | |
| download | tangerine-wallet-browser-6f28426a22e0218b3b65e707dd24e4680a3c3548.tar.gz tangerine-wallet-browser-6f28426a22e0218b3b65e707dd24e4680a3c3548.tar.zst tangerine-wallet-browser-6f28426a22e0218b3b65e707dd24e4680a3c3548.zip | |
Merge pull request #1284 from MetaMask/FixFirefoxPopup
Fix firefox popup
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | app/scripts/lib/extension.js | 5 | ||||
| -rw-r--r-- | app/scripts/lib/notifications.js | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e27f5c04..0a54cf886 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Popup new transactions in Firefox. + ## 3.5.2 2017-3-28 - Fix bug where gas estimate totals were sometimes wrong. diff --git a/app/scripts/lib/extension.js b/app/scripts/lib/extension.js index 4b670490f..6f8b5d800 100644 --- a/app/scripts/lib/extension.js +++ b/app/scripts/lib/extension.js @@ -11,4 +11,7 @@ */ const Extension = require('./extension-instance') -module.exports = new Extension() +const instance = new Extension() +window.METAMASK_EXTENSION = instance +module.exports = instance + diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index 3db1ac6b5..0ec01f3a7 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -22,10 +22,12 @@ function show () { extension.windows.create({ url: 'notification.html', type: 'popup', - focused: true, width, height, }) + .catch((reason) => { + log.error('failed to create poupup', reason) + }) } }) } |