diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-28 08:52:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 08:52:23 +0800 |
| commit | 903d3aeb7a3482f9de1d43d5634bdfec59715288 (patch) | |
| tree | b39e479311e2901416adc222b5970f2e47686b2b /app | |
| parent | a298130357996be48a61544154268025c4724cf4 (diff) | |
| parent | 3a1f1b3bc4a11c060f0002ffa4428310ae01ba19 (diff) | |
| download | tangerine-wallet-browser-903d3aeb7a3482f9de1d43d5634bdfec59715288.tar tangerine-wallet-browser-903d3aeb7a3482f9de1d43d5634bdfec59715288.tar.gz tangerine-wallet-browser-903d3aeb7a3482f9de1d43d5634bdfec59715288.tar.bz2 tangerine-wallet-browser-903d3aeb7a3482f9de1d43d5634bdfec59715288.tar.lz tangerine-wallet-browser-903d3aeb7a3482f9de1d43d5634bdfec59715288.tar.xz tangerine-wallet-browser-903d3aeb7a3482f9de1d43d5634bdfec59715288.tar.zst tangerine-wallet-browser-903d3aeb7a3482f9de1d43d5634bdfec59715288.zip | |
Merge pull request #1271 from MetaMask/i1223-InjectIFrames
Inject web3 in iFrames
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/contentscript.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/manifest.json b/app/manifest.json index 97cc7dd6d..a163d4c06 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -51,7 +51,7 @@ "scripts/contentscript.js" ], "run_at": "document_start", - "all_frames": false + "all_frames": true } ], "permissions": [ diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 020208ceb..09c1841bf 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -73,6 +73,6 @@ function isAllowedSuffix (testCase) { if (doctype) { return doctype.name === 'html' } else { - return false + return true } } |