Merge branch 'master' into i1567-FixInaccurateError

feature/default_network_editable
frankiebee 8 years ago
commit 3e359d6a6a
  1. 15
      ISSUE_TEMPLATE
  2. 6
      app/scripts/metamask-controller.js

@ -0,0 +1,15 @@
<!--
FAQ:
BEFORE SUBMITTING, please make sure your question hasn't been answered in our FAQ: https://github.com/MetaMask/faq
Common questions such as "Where is my ether?" or "Where did my tokens go?" are answered in the FAQ.
Bug Reports:
Briefly describe the issue you've encountered
* Expected Behavior
* Actual Behavior
* Browser Used
* Operating System Used
Screenshots are very helpful and will expedite your issue being resolved!
-->

@ -23,6 +23,7 @@ const autoFaucet = require('./lib/auto-faucet')
const nodeify = require('./lib/nodeify')
const accountImporter = require('./account-import-strategies')
const getBuyEthUrl = require('./lib/buy-eth-url')
const debounce = require('debounce')
const version = require('../manifest.json').version
@ -30,6 +31,9 @@ module.exports = class MetamaskController extends EventEmitter {
constructor (opts) {
super()
this.sendUpdate = debounce(this.privateSendUpdate.bind(this), 200)
this.opts = opts
const initState = opts.initState || {}
@ -355,7 +359,7 @@ module.exports = class MetamaskController extends EventEmitter {
)
}
sendUpdate () {
privateSendUpdate () {
this.emit('update', this.getState())
}

Loading…
Cancel
Save