merged develop

This commit is contained in:
Fabian Vogelsteller 2015-07-20 14:27:32 +02:00
parent 39d3ccf455
commit 8bbf2d1184
4 changed files with 5 additions and 2 deletions

1
dist/web3-light.js vendored
View File

@ -1865,6 +1865,7 @@ var checkForContractAddress = function(contract, abi, callback){
if(receipt && !callbackFired) {
web3.eth.getCode(receipt.contractAddress, function(e, code){
/*jshint maxcomplexity: 5 */
if(callbackFired)
return;

1
dist/web3.js vendored
View File

@ -1865,6 +1865,7 @@ var checkForContractAddress = function(contract, abi, callback){
if(receipt && !callbackFired) {
web3.eth.getCode(receipt.contractAddress, function(e, code){
/*jshint maxcomplexity: 5 */
if(callbackFired)
return;

4
dist/web3.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -133,6 +133,7 @@ var checkForContractAddress = function(contract, abi, callback){
if(receipt && !callbackFired) {
web3.eth.getCode(receipt.contractAddress, function(e, code){
/*jshint maxcomplexity: 5 */
if(callbackFired)
return;