embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-10 22:05:55 +00:00
Code Issues Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Iuri Matias 2017-08-03 19:12:49 -04:00
parent 3eb53ee6af
commit 42aa072811
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/build/embark.bundle.js
View File

@ -383,9 +383,6 @@ EmbarkJS.Storage.IPFS.uploadFile = function(inputSelector) {
}; };
EmbarkJS.Storage.IPFS.getUrl = function(hash) { EmbarkJS.Storage.IPFS.getUrl = function(hash) {
//var ipfsHash = web3.toAscii(hash);
//return 'http://localhost:8080/ipfs/' + hash;
return (self.getUrl || "http://localhost:8080/ipfs/") + hash; return (self.getUrl || "http://localhost:8080/ipfs/") + hash;
}; };
@ -399,18 +396,16 @@ EmbarkJS.Messages.web3CompatibleWithV5 = function() {
var _web3 = new Web3(); var _web3 = new Web3();
if (typeof(_web3.version) === "string") { if (typeof(_web3.version) === "string") {
return true; return true;
} else {
return parseInt(_web3.version.api.split('.')[1], 10) >= 20;
} }
return parseInt(_web3.version.api.split('.')[1], 10) >= 20;
}; };
EmbarkJS.Messages.isNewWeb3 = function() { EmbarkJS.Messages.isNewWeb3 = function() {
var _web3 = new Web3(); var _web3 = new Web3();
if (typeof(_web3.version) === "string") { if (typeof(_web3.version) === "string") {
return true; return true;
} else {
return parseInt(_web3.version.api.split('.')[0], 10) >= 1;
} }
return parseInt(_web3.version.api.split('.')[0], 10) >= 1;
}; };
EmbarkJS.Messages.getWhisperVersion = function(cb) { EmbarkJS.Messages.getWhisperVersion = function(cb) {

9
js/embark.js
View File

@ -301,9 +301,6 @@ EmbarkJS.Storage.IPFS.uploadFile = function(inputSelector) {
}; };
EmbarkJS.Storage.IPFS.getUrl = function(hash) { EmbarkJS.Storage.IPFS.getUrl = function(hash) {
//var ipfsHash = web3.toAscii(hash);
//return 'http://localhost:8080/ipfs/' + hash;
return (self.getUrl || "http://localhost:8080/ipfs/") + hash; return (self.getUrl || "http://localhost:8080/ipfs/") + hash;
}; };
@ -317,18 +314,16 @@ EmbarkJS.Messages.web3CompatibleWithV5 = function() {
var _web3 = new Web3(); var _web3 = new Web3();
if (typeof(_web3.version) === "string") { if (typeof(_web3.version) === "string") {
return true; return true;
} else {
return parseInt(_web3.version.api.split('.')[1], 10) >= 20;
} }
return parseInt(_web3.version.api.split('.')[1], 10) >= 20;
}; };
EmbarkJS.Messages.isNewWeb3 = function() { EmbarkJS.Messages.isNewWeb3 = function() {
var _web3 = new Web3(); var _web3 = new Web3();
if (typeof(_web3.version) === "string") { if (typeof(_web3.version) === "string") {
return true; return true;
} else {
return parseInt(_web3.version.api.split('.')[0], 10) >= 1;
} }
return parseInt(_web3.version.api.split('.')[0], 10) >= 1;
}; };
EmbarkJS.Messages.getWhisperVersion = function(cb) { EmbarkJS.Messages.getWhisperVersion = function(cb) {