diff options
| author | Dan <danjm.com@gmail.com> | 2018-04-10 03:22:26 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-04-10 03:22:26 +0800 |
| commit | 2c4426e4de745be880a994674dc1dc74c7ec74eb (patch) | |
| tree | 1de9b836026d3222b490793099b66372404b83ab /app/scripts/lib/is-popup-or-notification.js | |
| parent | 9dbb9d12ad31d53b8911db171cb7d6b3fcb477e2 (diff) | |
| parent | 4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1 (diff) | |
| download | tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.tar.gz tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.tar.zst tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.zip | |
Merge branch 'master' into i3580-InternationalizeCurrency
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' |