diff options
| author | Le Quoc Viet <vietlq85@gmail.com> | 2018-03-15 16:11:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 16:11:42 +0800 |
| commit | 04079455e36e48433cf8055c8f1f79e1e7e18298 (patch) | |
| tree | d7de2a6603b67b56abacf09bee4d2bbbfe886b8f /app/scripts/lib/is-popup-or-notification.js | |
| parent | 5bdee96e73f65a0b369277e9c56b0afe5159e65b (diff) | |
| parent | e2efc91aee64072c408ab509219dcbfb389c7609 (diff) | |
| download | tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.tar.gz tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.tar.zst tangerine-wallet-browser-04079455e36e48433cf8055c8f1f79e1e7e18298.zip | |
Merge pull request #1 from MetaMask/master
Merge from the source
Diffstat (limited to 'app/scripts/lib/is-popup-or-notification.js')
| -rw-r--r-- | app/scripts/lib/is-popup-or-notification.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/scripts/lib/is-popup-or-notification.js b/app/scripts/lib/is-popup-or-notification.js index 693fa8751..e2999411f 100644 --- a/app/scripts/lib/is-popup-or-notification.js +++ b/app/scripts/lib/is-popup-or-notification.js @@ -1,6 +1,9 @@ module.exports = function isPopupOrNotification () { const url = window.location.href - if (url.match(/popup.html$/)) { + // 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(?:\?.+)*$/)) { return 'popup' } else { return 'notification' |