fixed gulp build

This commit is contained in:
Marek Kotewicz 2015-01-06 13:26:51 +01:00
parent 1954b87819
commit af9242f4cc
9 changed files with 23 additions and 26 deletions

6
dist/ethereum.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -46,7 +46,7 @@ var findMethodIndex = function (json, methodName) {
}; };
var padLeft = function (string, chars) { var padLeft = function (string, chars) {
return Array(chars - string.length + 1).join("0") + string; return new Array(chars - string.length + 1).join("0") + string;
}; };
var setupInputTypes = function () { var setupInputTypes = function () {

View File

@ -27,12 +27,10 @@
* if it fails, it uses HttpRpcProvider * if it fails, it uses HttpRpcProvider
*/ */
// TODO: work out which of the following two lines it is supposed to be... if (process.env.NODE_ENV !== 'build') {
//if (process.env.NODE_ENV !== 'build') {
if ("build" !== 'build') {/*
var WebSocket = require('ws'); // jshint ignore:line var WebSocket = require('ws'); // jshint ignore:line
var web3 = require('./main.js'); // jshint ignore:line var web3 = require('./main.js'); // jshint ignore:line
*/} }
var AutoProvider = function (userOptions) { var AutoProvider = function (userOptions) {
if (web3.haveProvider()) { if (web3.haveProvider()) {

View File

@ -20,11 +20,10 @@
* @date 2014 * @date 2014
*/ */
// TODO: work out which of the following two lines it is supposed to be... if (process.env.NODE_ENV !== 'build') {
//if (process.env.NODE_ENV !== 'build') {
if ("build" !== 'build') {/*
var web3 = require('./web3'); // jshint ignore:line var web3 = require('./web3'); // jshint ignore:line
*/} }
var abi = require('./abi'); var abi = require('./abi');
var contract = function (address, desc) { var contract = function (address, desc) {

View File

@ -21,11 +21,9 @@
* @date 2014 * @date 2014
*/ */
// TODO: work out which of the following two lines it is supposed to be... if (process.env.NODE_ENV !== 'build') {
//if (process.env.NODE_ENV !== 'build') {
if ("build" !== "build") {/*
var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
*/} }
var HttpRpcProvider = function (host) { var HttpRpcProvider = function (host) {
this.handlers = []; this.handlers = [];

View File

@ -272,7 +272,7 @@ var web3 = {
}, },
toEth: function(str) { toEth: function(str) {
var val = typeof str === "string" ? str.indexOf('0x') == 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str; var val = typeof str === "string" ? str.indexOf('0x') === 0 ? parseInt(str.substr(2), 16) : parseInt(str) : str;
var unit = 0; var unit = 0;
var units = [ 'wei', 'Kwei', 'Mwei', 'Gwei', 'szabo', 'finney', 'ether', 'grand', 'Mether', 'Gether', 'Tether', 'Pether', 'Eether', 'Zether', 'Yether', 'Nether', 'Dether', 'Vether', 'Uether' ]; var units = [ 'wei', 'Kwei', 'Mwei', 'Gwei', 'szabo', 'finney', 'ether', 'grand', 'Mether', 'Gether', 'Tether', 'Pether', 'Eether', 'Zether', 'Yether', 'Nether', 'Dether', 'Vether', 'Uether' ];
while (val > 3000 && unit < units.length - 1) while (val > 3000 && unit < units.length - 1)
@ -281,10 +281,14 @@ var web3 = {
unit++; unit++;
} }
var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2); var s = val.toString().length < val.toFixed(2).length ? val.toString() : val.toFixed(2);
var replaceFunction = function($0, $1, $2) {
return $1 + ',' + $2;
};
while (true) { while (true) {
var o = s; var o = s;
s = s.replace(/(\d)(\d\d\d[\.\,])/, function($0, $1, $2) { return $1 + ',' + $2; }); s = s.replace(/(\d)(\d\d\d[\.\,])/, replaceFunction);
if (o == s) if (o === s)
break; break;
} }
return s + ' ' + units[unit]; return s + ' ' + units[unit];

View File

@ -22,11 +22,9 @@
* @date 2014 * @date 2014
*/ */
// TODO: work out which of the following two lines it is supposed to be... if (process.env.NODE_ENV !== 'build') {
//if (process.env.NODE_ENV !== 'build') {
if ("build" !== "build") {/*
var WebSocket = require('ws'); // jshint ignore:line var WebSocket = require('ws'); // jshint ignore:line
*/} }
var WebSocketProvider = function(host) { var WebSocketProvider = function(host) {
// onmessage handlers // onmessage handlers