diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-06-22 05:24:28 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-22 05:24:28 +0800 |
commit | 537328b5298a42f9d20862d42b9012babcda373c (patch) | |
tree | 9a5728447f5b23a918b4a23c12e91ea1b702e527 /app/scripts/popup.js | |
parent | bb7788373d9c234313d651d88c72c18a8e4ca0aa (diff) | |
parent | d7c3e8e9f5182576eb4a990d385ff8ce4ebd417c (diff) | |
download | tangerine-wallet-browser-537328b5298a42f9d20862d42b9012babcda373c.tar tangerine-wallet-browser-537328b5298a42f9d20862d42b9012babcda373c.tar.gz tangerine-wallet-browser-537328b5298a42f9d20862d42b9012babcda373c.tar.bz2 tangerine-wallet-browser-537328b5298a42f9d20862d42b9012babcda373c.tar.lz tangerine-wallet-browser-537328b5298a42f9d20862d42b9012babcda373c.tar.xz tangerine-wallet-browser-537328b5298a42f9d20862d42b9012babcda373c.tar.zst tangerine-wallet-browser-537328b5298a42f9d20862d42b9012babcda373c.zip |
Merge pull request #303 from MetaMask/AutoLint
Auto lint
Diffstat (limited to 'app/scripts/popup.js')
-rw-r--r-- | app/scripts/popup.js | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/app/scripts/popup.js b/app/scripts/popup.js index 4fa6e1127..5173507fa 100644 --- a/app/scripts/popup.js +++ b/app/scripts/popup.js @@ -19,7 +19,7 @@ async.parallel({ accountManager: connectToAccountManager, }, setupApp) -function connectToAccountManager(cb){ +function connectToAccountManager (cb) { // setup communication with background var pluginPort = chrome.runtime.connect({name: 'popup'}) var portStream = new PortStream(pluginPort) @@ -30,7 +30,7 @@ function connectToAccountManager(cb){ setupWeb3Connection(mx.createStream('provider')) } -function setupWeb3Connection(stream){ +function setupWeb3Connection (stream) { var remoteProvider = new StreamProvider() remoteProvider.pipe(stream).pipe(remoteProvider) stream.on('error', console.error.bind(console)) @@ -38,23 +38,23 @@ function setupWeb3Connection(stream){ global.web3 = new Web3(remoteProvider) } -function setupControllerConnection(stream, cb){ +function setupControllerConnection (stream, cb) { var eventEmitter = new EventEmitter() var background = Dnode({ - sendUpdate: function(state){ + sendUpdate: function (state) { eventEmitter.emit('update', state) }, }) stream.pipe(background).pipe(stream) - background.once('remote', function(accountManager){ + background.once('remote', function (accountManager) { // setup push events accountManager.on = eventEmitter.on.bind(eventEmitter) cb(null, accountManager) }) } -function getCurrentDomain(cb){ - chrome.tabs.query({active: true, currentWindow: true}, function(results){ +function getCurrentDomain (cb) { + chrome.tabs.query({active: true, currentWindow: true}, function (results) { var activeTab = results[0] var currentUrl = activeTab && activeTab.url var currentDomain = url.parse(currentUrl).host @@ -65,16 +65,15 @@ function getCurrentDomain(cb){ }) } -function setupApp(err, opts){ +function setupApp (err, opts) { if (err) { alert(err.stack) throw err - return } var container = document.getElementById('app-content') - var app = MetaMaskUi({ + MetaMaskUi({ container: container, accountManager: opts.accountManager, currentDomain: opts.currentDomain, |