Commit 3290e6fc authored by d11e9's avatar d11e9

handle endpoint updating and errors

parent 48a5fccb
...@@ -22,7 +22,7 @@ function UniversalDApp (contracts, options) { ...@@ -22,7 +22,7 @@ function UniversalDApp (contracts, options) {
} else { } else {
var host = options.host || "localhost"; var host = options.host || "localhost";
var port = options.port || "8545"; var port = options.port || "8545";
var rpc_url = options.web3endpoint || ('http://' + host + ':' + port); var rpc_url = options.getWeb3endpoint ? options.getWeb3endpoint() : ('http://' + host + ':' + port);
web3.setProvider( new web3.providers.HttpProvider( rpc_url ) ); web3.setProvider( new web3.providers.HttpProvider( rpc_url ) );
} }
...@@ -296,7 +296,8 @@ UniversalDApp.prototype.getCallButton = function(args) { ...@@ -296,7 +296,8 @@ UniversalDApp.prototype.getCallButton = function(args) {
} }
tryTillResponse( result, function(err, result) { tryTillResponse( result, function(err, result) {
if (isConstructor) { if (err) replaceOutput($result, $('<span/>').text(err).addClass('error'));
else if (isConstructor) {
$result.html(''); $result.html('');
args.appendFunctions(result.contractAddress); args.appendFunctions(result.contractAddress);
} else { } else {
......
...@@ -234,7 +234,11 @@ ...@@ -234,7 +234,11 @@
$vmToggle.on('change', executionContextChange ); $vmToggle.on('change', executionContextChange );
$web3Toggle.on('change', executionContextChange ); $web3Toggle.on('change', executionContextChange );
$web3endpoint.on('change', compile ); $web3endpoint.on('change', function(){
var endpoint = $('#web3Endpoint').val();
web3.setProvider( new web3.providers.HttpProvider( endpoint ) );
compile();
} );
function executionContextChange (ev) { function executionContextChange (ev) {
if (ev.target.value == 'web3' && !confirm("Are you sure you want to connect to a local ethereum node?") ) { if (ev.target.value == 'web3' && !confirm("Are you sure you want to connect to a local ethereum node?") ) {
...@@ -759,7 +763,6 @@ ...@@ -759,7 +763,6 @@
removable: false, removable: false,
getAddress: function(){ return $('#txorigin').val(); }, getAddress: function(){ return $('#txorigin').val(); },
removable_instances: true, removable_instances: true,
web3endpoint: $('#web3Endpoint').val(),
renderOutputModifier: function(contractName, $contractOutput) { renderOutputModifier: function(contractName, $contractOutput) {
var contract = data.contracts[contractName]; var contract = data.contracts[contractName];
return $contractOutput return $contractOutput
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment