aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/contentscript.js
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-07-11 02:32:05 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-07-11 02:32:05 +0800
commit28c509914bf09850dd9aaef52b212f6271633e93 (patch)
tree049373cf51ae16580a5f18dd29e195e68d4f7b53 /app/scripts/contentscript.js
parent94a4f99115cf549a3014d29d828e7a432bf36a62 (diff)
parentf6de948e42ae633d40aef72595a01caa622a280d (diff)
downloadtangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.gz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.bz2
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.lz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.xz
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.tar.zst
tangerine-wallet-browser-28c509914bf09850dd9aaef52b212f6271633e93.zip
Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896
Diffstat (limited to 'app/scripts/contentscript.js')
-rw-r--r--app/scripts/contentscript.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 75e0a95b3..b35a70dd2 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -115,8 +115,8 @@ function logStreamDisconnectWarning (remoteLabel, err) {
* @returns {boolean} {@code true} if Web3 should be injected
*/
function shouldInjectWeb3 () {
- return doctypeCheck() && suffixCheck()
- && documentElementCheck() && !blacklistedDomainCheck()
+ return doctypeCheck() && suffixCheck() &&
+ documentElementCheck() && !blacklistedDomainCheck()
}
/**