diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-04-10 01:55:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 01:55:46 +0800 |
| commit | 4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1 (patch) | |
| tree | 3439d92871f38765cf5dfa4ac310b11aeb5068bb /app | |
| parent | 2511a9e634234135862259510a38b69308c2b81b (diff) | |
| parent | 1e6f062bb6bbc39d6ab21a351fdb0d3bcab4d7d5 (diff) | |
| download | tangerine-wallet-browser-4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1.tar tangerine-wallet-browser-4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1.tar.gz tangerine-wallet-browser-4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1.tar.bz2 tangerine-wallet-browser-4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1.tar.lz tangerine-wallet-browser-4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1.tar.xz tangerine-wallet-browser-4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1.tar.zst tangerine-wallet-browser-4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1.zip | |
Merge pull request #3921 from MetaMask/gh-3736-react-router
Add react-router integration
Diffstat (limited to 'app')
| -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' |