diff options
| author | Thomas <tmashuang@gmail.com> | 2018-04-11 23:35:31 +0800 |
|---|---|---|
| committer | Thomas <tmashuang@gmail.com> | 2018-04-11 23:35:31 +0800 |
| commit | f82c51c2c4782f54fb1d690f2dc1c309fafefe65 (patch) | |
| tree | 84e5d2a1b989459f3dbb6f74e1921b4b83f705a0 /app/scripts/lib/is-popup-or-notification.js | |
| parent | 30474ccd35d5d7f30ffb8dff0acc8fbc77f44731 (diff) | |
| parent | 29dab1e9e00c1c1e6ad834026df51b2839d3171d (diff) | |
| download | tangerine-wallet-browser-f82c51c2c4782f54fb1d690f2dc1c309fafefe65.tar.gz tangerine-wallet-browser-f82c51c2c4782f54fb1d690f2dc1c309fafefe65.tar.zst tangerine-wallet-browser-f82c51c2c4782f54fb1d690f2dc1c309fafefe65.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'app/scripts/lib/is-popup-or-notification.js')
| -rw-r--r-- | app/scripts/lib/is-popup-or-notification.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/lib/is-popup-or-notification.js b/app/scripts/lib/is-popup-or-notification.js index e2999411f..ad3e825c0 100644 --- a/app/scripts/lib/is-popup-or-notification.js +++ b/app/scripts/lib/is-popup-or-notification.js @@ -3,7 +3,8 @@ module.exports = function isPopupOrNotification () { // 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(?:\?.+)*$/)) { + if (url.match(/popup.html(?:\?.+)*$/) || + url.match(/home.html(?:\?.+)*$/) || url.match(/home.html(?:#.*)*$/)) { return 'popup' } else { return 'notification' |