poanetwork
/
web3.js
mirror of https://github.com/poanetwork/web3.js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into allevents 

Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
This commit is contained in:
Marek Kotewicz 2015-06-24 12:10:46 +02:00
parent 7aca17e071 c5ee34d349
commit 6f74d57ae8
6 changed files with 178 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/web3-light.js vendored
View File

@ -2409,7 +2409,12 @@ SolidityEvent.prototype.execute = function (indexed, options, callback) {
if (utils.isFunction(arguments[arguments.length - 1])) {
callback = arguments[arguments.length - 1];
options = null;
if(arguments.length === 2)
options = null;
if(arguments.length === 1) {
options = null;
indexed = {};
}
}
var o = this.encode(indexed, options);

8
dist/web3-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
dist/web3.js vendored
View File

@ -2409,7 +2409,12 @@ SolidityEvent.prototype.execute = function (indexed, options, callback) {
if (utils.isFunction(arguments[arguments.length - 1])) {
callback = arguments[arguments.length - 1];
options = null;
if(arguments.length === 2)
options = null;
if(arguments.length === 1) {
options = null;
indexed = {};
}
}
var o = this.encode(indexed, options);

151
dist/web3.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

11
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
lib/web3/event.js
View File

@ -175,7 +175,12 @@ SolidityEvent.prototype.execute = function (indexed, options, callback) {
if (utils.isFunction(arguments[arguments.length - 1])) {
callback = arguments[arguments.length - 1];
options = null;
if(arguments.length === 2)
options = null;
if(arguments.length === 1) {
options = null;
indexed = {};
}
}
var o = this.encode(indexed, options);