Merge pull request #1275 from MetaMask/injection-polish

Fix injection logic.
This commit is contained in:
Dan Finlay 2017-03-28 14:41:04 -07:00 committed by GitHub
commit 731f665409
1 changed files with 16 additions and 3 deletions

View File

@ -65,14 +65,27 @@ function setupStreams () {
}
function shouldInjectWeb3 () {
return isAllowedSuffix(window.location.href)
return doctypeCheck() || suffixCheck()
}
function isAllowedSuffix (testCase) {
function doctypeCheck () {
const doctype = window.document.doctype
if (doctype) {
return doctype.name === 'html'
} else {
return true
return false
}
}
function suffixCheck() {
var prohibitedTypes = ['xml', 'pdf']
var currentUrl = window.location.href
var currentRegex
for (let i = 0; i < prohibitedTypes.length; i++) {
currentRegex = new RegExp(`\.${prohibitedTypes[i]}$`)
if (currentRegex.test(currentUrl)) {
return false
}
}
return true
}