diff options
| author | TrejGun <trejgun@gmail.com> | 2018-07-05 11:34:13 +0800 |
|---|---|---|
| committer | TrejGun <trejgun@gmail.com> | 2018-07-05 11:34:13 +0800 |
| commit | 94d1d846fb57932fd1e959f53dbf6444f0789e91 (patch) | |
| tree | 369276cd66bdcae85cac77b2c9b2458de5b08dd7 /app/scripts/contentscript.js | |
| parent | c94f639de55a867ebe8d3599d337a1f7341b1979 (diff) | |
| parent | fd218142acb6dab0b2f921b9729f17ff90cffc2d (diff) | |
| download | tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.tar.gz tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.tar.zst tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.zip | |
Merge branch 'develop' into contextTypes
# Conflicts:
# ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
Diffstat (limited to 'app/scripts/contentscript.js')
| -rw-r--r-- | app/scripts/contentscript.js | 4 |
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() } /** |