diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-02-28 03:25:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 03:25:29 +0800 |
| commit | 3fefccd37219c9b4b513fc8d929723e07022b9c4 (patch) | |
| tree | 22865ecd672570a6162ac3c9402ec9d63ad3f7ef /app/scripts/lib/is-popup-or-notification.js | |
| parent | 6a7ea00cd34f83b257f6b4280a5f4e20aa5d34ee (diff) | |
| parent | ced62ac551a095c8f94f550f0c01a9d4fd04ce5b (diff) | |
| download | tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.tar.gz tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.tar.zst tangerine-wallet-browser-3fefccd37219c9b4b513fc8d929723e07022b9c4.zip | |
Merge branch 'master' into mascara-deploy
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' |