diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-03-31 02:15:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 02:15:12 +0800 |
| commit | 8e0f39353dd47c4a201aaf2ee160912846f2e68b (patch) | |
| tree | 0fac2629c48dcf4134d8205441766e3c6a41b4ed /app | |
| parent | 9d4be1842e7c56e3bfde529ff555dcae8dec3dbd (diff) | |
| parent | 89e6baa3ba07cc46dcc62886fbe3f1906649ae77 (diff) | |
| download | tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.gz tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.bz2 tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.lz tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.xz tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.tar.zst tangerine-wallet-browser-8e0f39353dd47c4a201aaf2ee160912846f2e68b.zip | |
Merge pull request #3781 from MetaMask/ci-artifacts
Build - Refactor + CircleCI Mascara builds
Diffstat (limited to 'app')
| -rw-r--r-- | app/home.html | 4 | ||||
| -rw-r--r-- | app/manifest.json | 10 | ||||
| -rw-r--r-- | app/notification.html | 2 | ||||
| -rw-r--r-- | app/popup.html | 4 | ||||
| -rw-r--r-- | app/scripts/contentscript.js | 6 | ||||
| -rw-r--r-- | app/scripts/ui.js (renamed from app/scripts/popup.js) | 0 |
6 files changed, 13 insertions, 13 deletions
diff --git a/app/home.html b/app/home.html index cfb4b00a0..4fad0f993 100644 --- a/app/home.html +++ b/app/home.html @@ -3,10 +3,10 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no"> - <title>MetaMask Plugin</title> + <title>MetaMask</title> </head> <body> <div id="app-content"></div> - <script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script> + <script src="./ui.js" type="text/javascript" charset="utf-8"></script> </body> </html> diff --git a/app/manifest.json b/app/manifest.json index a20f9b976..1982b4820 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -27,8 +27,8 @@ "default_locale": "en", "background": { "scripts": [ - "scripts/chromereload.js", - "scripts/background.js" + "chromereload.js", + "background.js" ], "persistent": true }, @@ -48,7 +48,7 @@ "https://*/*" ], "js": [ - "scripts/contentscript.js" + "contentscript.js" ], "run_at": "document_start", "all_frames": true @@ -62,11 +62,11 @@ "https://*.infura.io/" ], "web_accessible_resources": [ - "scripts/inpage.js" + "inpage.js" ], "externally_connectable": { "matches": [ "https://metamask.io/*" ] } -}
\ No newline at end of file +} diff --git a/app/notification.html b/app/notification.html index f10cbbf41..457ba7137 100644 --- a/app/notification.html +++ b/app/notification.html @@ -11,6 +11,6 @@ </head> <body class="notification" style="height:600px;"> <div id="app-content"></div> - <script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script> + <script src="./ui.js" type="text/javascript" charset="utf-8"></script> </body> </html> diff --git a/app/popup.html b/app/popup.html index bf09b97ca..3acfd8c55 100644 --- a/app/popup.html +++ b/app/popup.html @@ -3,10 +3,10 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no"> - <title>MetaMask Plugin</title> + <title>MetaMask</title> </head> <body style="width:357px; height:600px;"> <div id="app-content"></div> - <script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script> + <script src="./ui.js" type="text/javascript" charset="utf-8"></script> </body> </html> diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 7abbc60e7..2098fae27 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -7,8 +7,8 @@ const ObjectMultiplex = require('obj-multiplex') const extension = require('extensionizer') const PortStream = require('./lib/port-stream.js') -const inpageContent = fs.readFileSync(path.join(__dirname, '..', '..', 'dist', 'chrome', 'scripts', 'inpage.js')).toString() -const inpageSuffix = '//# sourceURL=' + extension.extension.getURL('scripts/inpage.js') + '\n' +const inpageContent = fs.readFileSync(path.join(__dirname, '..', '..', 'dist', 'chrome', 'inpage.js')).toString() +const inpageSuffix = '//# sourceURL=' + extension.extension.getURL('inpage.js') + '\n' const inpageBundle = inpageContent + inpageSuffix // Eventually this streaming injection could be replaced with: @@ -96,7 +96,7 @@ function logStreamDisconnectWarning (remoteLabel, err) { } function shouldInjectWeb3 () { - return doctypeCheck() && suffixCheck() + return doctypeCheck() && suffixCheck() && documentElementCheck() && !blacklistedDomainCheck() } diff --git a/app/scripts/popup.js b/app/scripts/ui.js index 13c7ac5ec..13c7ac5ec 100644 --- a/app/scripts/popup.js +++ b/app/scripts/ui.js |