diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-20 07:29:36 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-20 07:29:36 +0800 |
| commit | 77c545336b38aefc6105cde1799b18066df8bef9 (patch) | |
| tree | 121a140131c8cb1f4b746d8f37d4a403b0910aad /app/scripts/lib/is-popup-or-notification.js | |
| parent | 98b5a62fa74aa6730a25df28dfe5032cfb487697 (diff) | |
| parent | 4e63924e607a07f94ff0a741a036ab352b0b7a3f (diff) | |
| download | tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.tar.gz tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.tar.zst tangerine-wallet-browser-77c545336b38aefc6105cde1799b18066df8bef9.zip | |
Merge branch 'uat' into newmaster
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' |