merged develop

This commit is contained in:
Fabian Vogelsteller 2017-01-13 14:26:12 +01:00
commit 0720bf3293
No known key found for this signature in database
GPG Key ID: E51EADA77F1A4124
6 changed files with 205 additions and 17 deletions

5
dist/web3-light.js vendored
View File

@ -5631,13 +5631,10 @@ module.exports = Property;
* @date 2015
*/
"use strict";
var errors = require('../errors');
// workaround to use httpprovider in different envs
var XMLHttpRequest; // jshint ignore: line
var XHR2 = require('xhr2');; // jshint ignore: line
// browser
if (typeof window !== 'undefined' && window.XMLHttpRequest) {
@ -5647,6 +5644,8 @@ if (typeof window !== 'undefined' && window.XMLHttpRequest) {
XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore: line
}
var XHR2 = require('xhr2'); // jshint ignore: line
/**
* HttpProvider should be used to send rpc calls over http
*/

File diff suppressed because one or more lines are too long

5
dist/web3.js vendored
View File

@ -5631,13 +5631,10 @@ module.exports = Property;
* @date 2015
*/
"use strict";
var errors = require('../errors');
// workaround to use httpprovider in different envs
var XMLHttpRequest; // jshint ignore: line
var XHR2 = require('xhr2');; // jshint ignore: line
// browser
if (typeof window !== 'undefined' && window.XMLHttpRequest) {
@ -5647,6 +5644,8 @@ if (typeof window !== 'undefined' && window.XMLHttpRequest) {
XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore: line
}
var XHR2 = require('xhr2'); // jshint ignore: line
/**
* HttpProvider should be used to send rpc calls over http
*/

191
dist/web3.js.map vendored Normal file

File diff suppressed because one or more lines are too long

14
dist/web3.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -22,13 +22,10 @@
* @date 2015
*/
"use strict";
var errors = require('../errors');
// workaround to use httpprovider in different envs
var XMLHttpRequest; // jshint ignore: line
var XHR2 = require('xhr2');; // jshint ignore: line
// browser
if (typeof window !== 'undefined' && window.XMLHttpRequest) {
@ -38,6 +35,8 @@ if (typeof window !== 'undefined' && window.XMLHttpRequest) {
XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore: line
}
var XHR2 = require('xhr2'); // jshint ignore: line
/**
* HttpProvider should be used to send rpc calls over http
*/