1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00

Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into Trigalti-develop

This commit is contained in:
kumavis 2018-05-21 14:14:03 -07:00
commit f19d8a5905

View File

@ -166,7 +166,7 @@ function documentElementCheck () {
/** /**
* Checks if the current domain is blacklisted * Checks if the current domain is blacklisted
* *
* @returns {boolean} {@code true} if the current domain is blacklisted * @returns {boolean} {@code true} if the current domain is blacklisted
*/ */
function blacklistedDomainCheck () { function blacklistedDomainCheck () {
@ -175,6 +175,7 @@ function blacklistedDomainCheck () {
'dropbox.com', 'dropbox.com',
'webbyawards.com', 'webbyawards.com',
'cdn.shopify.com/s/javascripts/tricorder/xtld-read-only-frame.html', 'cdn.shopify.com/s/javascripts/tricorder/xtld-read-only-frame.html',
'adyen.com',
] ]
var currentUrl = window.location.href var currentUrl = window.location.href
var currentRegex var currentRegex