diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-08-25 07:15:43 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-08-25 07:15:43 +0800 |
| commit | eee08457e51c6d4a4d4817671b93fa57933e338f (patch) | |
| tree | 53f6d83ded894c0b4b16b92cf81bcabb82eff818 /app | |
| parent | 15c8680e21cce1295dd3ec2959bd96373c1f4451 (diff) | |
| parent | c8c77aa8bd03125261e094b0cb264ed9fa9d9d77 (diff) | |
| download | tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.tar tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.tar.gz tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.tar.bz2 tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.tar.lz tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.tar.xz tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.tar.zst tangerine-wallet-browser-eee08457e51c6d4a4d4817671b93fa57933e338f.zip | |
Merge branch 'master' into i484PersistPendingSignatures
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 10 | ||||
| -rw-r--r-- | app/scripts/lib/config-manager.js | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app/manifest.json b/app/manifest.json index 09bc9eb37..c1b9ee817 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -4,6 +4,16 @@ "version": "2.9.0", "manifest_version": 2, "description": "Ethereum Browser Extension", + "commands": { + "_execute_browser_action": { + "suggested_key": { + "windows": "Ctrl+Alt+M", + "mac": "Command+Alt+M", + "chromeos": "Ctrl+Alt+M", + "linux": "Ctrl+Alt+M" + } + } + }, "icons": { "16": "images/icon-16.png", "128": "images/icon-128.png" diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 4d270bcdb..715efb42e 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -300,9 +300,10 @@ ConfigManager.prototype.updateConversionRate = function () { this.setConversionPrice(0) this.setConversionDate('N/A') }) + } -ConfigManager.prototype.setConversionPrice = function(price) { +ConfigManager.prototype.setConversionPrice = function (price) { var data = this.getData() data.conversionRate = Number(price) this.setData(data) @@ -372,4 +373,3 @@ ConfigManager.prototype.createShapeShiftTx = function (depositAddress, depositTy } this.setData(data) } - |