Commit f0d18b86 authored by yann300's avatar yann300

still display alert

parent 32db5ed0
...@@ -899,11 +899,7 @@ var run = function () { ...@@ -899,11 +899,7 @@ var run = function () {
runCompiler() runCompiler()
if (queryParams.get().context) { if (queryParams.get().context) {
executionContext.setContext(queryParams.get().context, false) executionContext.setContext(queryParams.get().context, queryParams.get().endpointurl)
}
if (queryParams.get().endpointurl) {
executionContext.setEndPointUrl(queryParams.get().endpointurl)
} }
if (queryParams.get().debugtx) { if (queryParams.get().debugtx) {
......
...@@ -86,28 +86,24 @@ function ExecutionContext () { ...@@ -86,28 +86,24 @@ function ExecutionContext () {
return vm return vm
} }
this.setEndPointUrl = function (url) { this.setContext = function (context, endPointUrl) {
setProviderFromEndpoint(url)
}
this.setContext = function (context, alert) {
executionContext = context executionContext = context
executionContextChange(context, alert) executionContextChange(context, endPointUrl)
} }
function executionContextChange (context, alert) { function executionContextChange (context, endPointUrl) {
if (alert && context === 'web3' && !confirm('Are you sure you want to connect to a local ethereum node?')) { if (context === 'web3' && !confirm('Are you sure you want to connect to an external ethereum node?')) {
return false return false
} else if (context === 'injected' && injectedProvider === undefined) { } else if (context === 'injected' && injectedProvider === undefined) {
return false return false
} else { } else {
if (context === 'web3') { if (context === 'web3') {
executionContext = context executionContext = context
var endPoint = 'http://localhost:8545' if (!endPointUrl) {
if (alert) { endPointUrl = 'http://localhost:8545'
endPoint = prompt('Please type Web3 Provider Endpoint', endPoint)
} }
setProviderFromEndpoint(endPoint) endPointUrl = prompt('Web3 Provider Endpoint', endPointUrl)
setProviderFromEndpoint(endPointUrl)
self.event.trigger('contextChanged', ['web3']) self.event.trigger('contextChanged', ['web3'])
} else if (context === 'injected') { } else if (context === 'injected') {
executionContext = context executionContext = context
...@@ -139,7 +135,7 @@ function ExecutionContext () { ...@@ -139,7 +135,7 @@ function ExecutionContext () {
var selectExEnv = document.querySelector('#selectExEnv') var selectExEnv = document.querySelector('#selectExEnv')
selectExEnv.addEventListener('change', function (event) { selectExEnv.addEventListener('change', function (event) {
if (!executionContextChange(selectExEnv.options[selectExEnv.selectedIndex].value, true)) { if (!executionContextChange(selectExEnv.options[selectExEnv.selectedIndex].value)) {
selectExEnv.value = executionContext selectExEnv.value = executionContext
} }
}) })
......
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