diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2017-11-29 12:24:35 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2017-12-15 04:50:20 +0800 |
| commit | e226b10a89d87af07c7c35ff1251a8264f3bb1b8 (patch) | |
| tree | 2a1507463ac1074a39e4ebd3ae609be0a2962bc6 /app/scripts/lib | |
| parent | 339eb7d1a687f141e822c745c568063783d44f15 (diff) | |
| download | tangerine-wallet-browser-e226b10a89d87af07c7c35ff1251a8264f3bb1b8.tar tangerine-wallet-browser-e226b10a89d87af07c7c35ff1251a8264f3bb1b8.tar.gz tangerine-wallet-browser-e226b10a89d87af07c7c35ff1251a8264f3bb1b8.tar.bz2 tangerine-wallet-browser-e226b10a89d87af07c7c35ff1251a8264f3bb1b8.tar.lz tangerine-wallet-browser-e226b10a89d87af07c7c35ff1251a8264f3bb1b8.tar.xz tangerine-wallet-browser-e226b10a89d87af07c7c35ff1251a8264f3bb1b8.tar.zst tangerine-wallet-browser-e226b10a89d87af07c7c35ff1251a8264f3bb1b8.zip | |
Add react-router to allow use of the browser back button
Diffstat (limited to 'app/scripts/lib')
| -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' |