embarklabs
/
EmbarkJS
mirror of https://github.com/embarklabs/EmbarkJS.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20 from embark-framework/bugfix/onReady 

Fix showing the indicator
This commit is contained in:
Iuri Matias 2018-09-07 18:45:56 -04:00 committed by GitHub
parent 722631084c 91475d44b9
commit 848238dc80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blockchain.js
View File

@ -108,7 +108,9 @@ let Contract = function (options) {
let originalMethods = Object.keys(ContractClass); let originalMethods = Object.keys(ContractClass);
Blockchain.execWhenReady(function() { Blockchain.execWhenReady(function() {
ContractClass.setProvider(web3.currentProvider); if(!ContractClass.currentProvider){
ContractClass.setProvider(web3.currentProvider);
}
ContractClass.options.from = web3.eth.defaultAccount; ContractClass.options.from = web3.eth.defaultAccount;
}); });

6
src/index.js
View File

@ -6,10 +6,8 @@ import Utils from './utils';
var EmbarkJS = { var EmbarkJS = {
onReady: function (cb) { onReady: function (cb) {
if (this.Blockchain.done) { Blockchain.execWhenReady(cb)
return cb(); Blockchain.finalCb = function() {
}
this.Blockchain.finalCb = function() {
cb(); cb();
} }
} }