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 abi_refactor 

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-04-20 11:51:10 +02:00
parent 779a608076 677bb68633
commit a46b9ea016
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/web3-light.js vendored
View File

@ -2570,7 +2570,7 @@ var inputPostFormatter = function(post) {
// fallback
if (!utils.isArray(post.topics)) {
post.topics = [post.topics];
post.topics = post.topics ? [post.topics] : [];
}
// format the following options
@ -2602,6 +2602,9 @@ var outputPostFormatter = function(post){
}
// format the following options
if (!post.topics) {
post.topics = [];
}
post.topics = post.topics.map(function(topic){
return utils.toAscii(topic);
});

4
dist/web3-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

5
dist/web3.js vendored
View File

@ -2570,7 +2570,7 @@ var inputPostFormatter = function(post) {
// fallback
if (!utils.isArray(post.topics)) {
post.topics = [post.topics];
post.topics = post.topics ? [post.topics] : [];
}
// format the following options
@ -2602,6 +2602,9 @@ var outputPostFormatter = function(post){
}
// format the following options
if (!post.topics) {
post.topics = [];
}
post.topics = post.topics.map(function(topic){
return utils.toAscii(topic);
});

4
dist/web3.js.map vendored
View File

File diff suppressed because one or more lines are too long

5
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
lib/web3/formatters.js
View File

@ -160,7 +160,7 @@ var inputPostFormatter = function(post) {
// fallback
if (!utils.isArray(post.topics)) {
post.topics = [post.topics];
post.topics = post.topics ? [post.topics] : [];
}
// format the following options
@ -192,6 +192,9 @@ var outputPostFormatter = function(post){
}
// format the following options
if (!post.topics) {
post.topics = [];
}
post.topics = post.topics.map(function(topic){
return utils.toAscii(topic);
});