merged develop

This commit is contained in:
Fabian Vogelsteller 2015-03-12 16:37:27 +01:00
commit 9c3d1b25b4
5 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
{ {
"name": "ethereum.js", "name": "ethereum.js",
"namespace": "ethereum", "namespace": "ethereum",
"version": "0.1.1", "version": "0.1.2",
"description": "Ethereum Compatible JavaScript API", "description": "Ethereum Compatible JavaScript API",
"main": [ "main": [
"./dist/ethereum.js", "./dist/ethereum.js",

2
dist/ethereum.js vendored
View File

@ -2683,7 +2683,7 @@ var requestManager = function() {
var poll = function () { var poll = function () {
polls.forEach(function (data) { polls.forEach(function (data) {
// send async // send async
send(data.data, function(result){ send(data.data, function(error, result){
if (!(result instanceof Array) || result.length === 0) { if (!(result instanceof Array) || result.length === 0) {
return; return;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -136,7 +136,7 @@ var requestManager = function() {
var poll = function () { var poll = function () {
polls.forEach(function (data) { polls.forEach(function (data) {
// send async // send async
send(data.data, function(result){ send(data.data, function(error, result){
if (!(result instanceof Array) || result.length === 0) { if (!(result instanceof Array) || result.length === 0) {
return; return;
} }