diff options
author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-04-18 00:38:38 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-18 00:38:38 +0800 |
commit | bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8 (patch) | |
tree | a1b0877175b6555dcded6bb61bc07e1ada81e12d /app/scripts/lib/is-popup-or-notification.js | |
parent | e4eb69dcc290a7e7eb27cab7ec57a8097345d81e (diff) | |
parent | b0a105ce809b8b7e5e4431bd1ddecc523586cad0 (diff) | |
download | tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.gz tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.bz2 tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.lz tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.xz tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.zst tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.zip |
Merge pull request #3995 from MetaMask/i3759-popup
Fix confirmation popup not always opening
Diffstat (limited to 'app/scripts/lib/is-popup-or-notification.js')
-rw-r--r-- | app/scripts/lib/is-popup-or-notification.js | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/scripts/lib/is-popup-or-notification.js b/app/scripts/lib/is-popup-or-notification.js deleted file mode 100644 index ad3e825c0..000000000 --- a/app/scripts/lib/is-popup-or-notification.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = function isPopupOrNotification () { - const url = window.location.href - // if (url.match(/popup.html$/) || url.match(/home.html$/)) { - // Below regexes needed for feature toggles (e.g. see line ~340 in ui/app/app.js) - // Revert below regexes to above commented out regexes before merge to master - if (url.match(/popup.html(?:\?.+)*$/) || - url.match(/home.html(?:\?.+)*$/) || url.match(/home.html(?:#.*)*$/)) { - return 'popup' - } else { - return 'notification' - } -} |