Merge branch 'master' into i743-FixDelegateCallFlag

CHANGELOG.md

@@ -2,12 +2,16 @@
 
 ## Current Master
 
+## 2.13.5 2016-10-18
+
 - Increase default max gas to `100000` over the RPC's `estimateGas` response.
+- Fix bug where slow-loading dapps would sometimes trigger infinite reload loops.
 
 ## 2.13.4 2016-10-17
 
 - Add custom transaction fee field to send form.
 - Fix bug where web3 was being injected into XML files.
+- Fix bug where changing network would not reload current Dapps.
 
 ## 2.13.3 2016-10-4
 

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.13.4",
+  "version": "2.13.5",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",

app/scripts/inpage.js

@@ -43,7 +43,7 @@ reloadStream.once('data', triggerReload)
 var pingChannel = inpageProvider.multiStream.createStream('pingpong')
 var pingStream = new PingStream({ objectMode: true })
 // wait for first successful reponse
-metamaskStream.once('data', function(){
+metamaskStream.once('_data', function(){
   pingStream.pipe(pingChannel).pipe(pingStream)
 })
 endOfStream(pingStream, triggerReload)

package.json

@@ -7,7 +7,7 @@
     "start": "gulp dev",
     "lint": "gulp lint",
     "dev": "gulp dev",
-    "dist": "gulp dist",
+    "dist": "gulp dist --disableLiveReload",
     "test": "npm run fastTest && npm run ci && npm run lint",
     "fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"",
     "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"",