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

Merge pull request #595 from embark-framework/bad_connection_handling_patch_fix 

Bad connection handling patch fix
This commit is contained in:
Iuri Matias 2018-06-29 18:38:48 -04:00 committed by GitHub
parent 098a8963a9 6ee387653d
commit b1684d8c73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/contracts/code_generator.js
View File

@ -126,7 +126,6 @@ class CodeGenerator {
result += plugin.generateProvider(self) + "\n"; result += plugin.generateProvider(self) + "\n";
}); });
} else { } else {
let web3Load; let web3Load;
if (isDeployment) { if (isDeployment) {
@ -134,11 +133,8 @@ class CodeGenerator {
web3Load = Templates.define_web3_simple({url: connection, done: 'done();'}); web3Load = Templates.define_web3_simple({url: connection, done: 'done();'});
} else { } else {
let connectionList = "[" + this.contractsConfig.dappConnection.map((x) => '"' + x + '"').join(',') + "]"; let connectionList = "[" + this.contractsConfig.dappConnection.map((x) => '"' + x + '"').join(',') + "]";
if (self.env === 'development') { let isDev = (self.env === 'development');
web3Load = Templates.web3_connector({connectionList: connectionList, done: 'done();', warnAboutMetamask: true}); web3Load = Templates.web3_connector({connectionList: connectionList, done: 'done(err);', warnAboutMetamask: isDev});
} else {
web3Load = Templates.web3_connector({connectionList: connectionList, done: 'done();', warnAboutMetamask: true});
}
} }
result += Templates.do_when_loaded({block: web3Load}); result += Templates.do_when_loaded({block: web3Load});

6
lib/contracts/code_templates/load-manager.js.ejs
View File

@ -1,4 +1,4 @@
__mainContext.__LoadManager = function() { this.list = []; this.done = false; } __mainContext.__LoadManager = function() { this.list = []; this.done = false; this.err = null; }
__mainContext.__LoadManager.prototype.execWhenReady = function(cb) { if (this.done) { cb(); } else { this.list.push(cb) } } __mainContext.__LoadManager.prototype.execWhenReady = function(cb) { if (this.done) { cb(this.err); } else { this.list.push(cb) } }
__mainContext.__LoadManager.prototype.doFirst = function(todo) { var self = this; todo(function() { self.done = true; self.list.map((x) => x.apply()) }) } __mainContext.__LoadManager.prototype.doFirst = function(todo) { var self = this; todo(function(err) { self.done = true; self.err = err; self.list.map((x) => x.apply(x, [self.err])) }) }
__mainContext.__loadManagerInstance = new __mainContext.__LoadManager(); __mainContext.__loadManagerInstance = new __mainContext.__LoadManager();

8
lib/contracts/code_templates/web3-connector.js.ejs
View File

@ -25,12 +25,14 @@ __reduce(<%- connectionList %>,function(prev, value, next) {
}); });
}, function(err, _result) { }, function(err, _result) {
__getAccounts(function(err, accounts) { __getAccounts(function(err, accounts) {
web3.eth.defaultAccount = accounts[0];
<% if (warnAboutMetamask) { %> <% if (warnAboutMetamask) { %>
if (web3.eth.currentProvider.isMetaMask) { if (web3.eth.currentProvider && web3.eth.currentProvider.isMetaMask) {
console.log("Note: Embark has detected you are in the development environment and using Metamask, please make sure Metamask is connected to your local node"); console.log("%cNote: Embark has detected you are in the development environment and using Metamask, please make sure Metamask is connected to your local node", "font-size: 2em");
} }
<% } %> <% } %>
if (accounts) {
web3.eth.defaultAccount = accounts[0];
}
<%- done %> <%- done %>
}); });
}); });