status-im/web3.js
2
0
Fork 0
mirror of https://github.com/status-im/web3.js.git synced 2025-02-24 03:58:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ethereum/web3.js into develop

Browse Source
This commit is contained in:
Fabian Vogelsteller 2016-02-12 13:58:05 +01:00
commit bc45b70e96
1 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/web3/contract.js
View File

@ -166,20 +166,6 @@ var ContractFactory = function (eth, abi) {
this.eth = eth;
this.abi = abi;
this.new.getData = this.getData.bind(this);
};
/**
* Should be called to create new ContractFactory
*
* @method contract
* @param {Array} abi
* @returns {ContractFactory} new contract factory
*/
//var contract = function (abi) {
//return new ContractFactory(abi);
//};
/**
* Should be called to create new contract on a blockchain
*
@ -190,7 +176,7 @@ var ContractFactory = function (eth, abi) {
* @param {Function} callback
* @returns {Contract} returns contract instance
*/
ContractFactory.prototype.new = function () {
this.new = function () {
var contract = new Contract(this.eth, this.abi);
// parse arguments
@ -236,6 +222,22 @@ ContractFactory.prototype.new = function () {
return contract;
};
this.new.getData = this.getData.bind(this);
};
/**
* Should be called to create new ContractFactory
*
* @method contract
* @param {Array} abi
* @returns {ContractFactory} new contract factory
*/
//var contract = function (abi) {
//return new ContractFactory(abi);
//};
/**
* Should be called to get access to existing contract on a blockchain
*
@ -294,4 +296,3 @@ var Contract = function (eth, abi, address) {
};
module.exports = ContractFactory;