still display alert

pull/1/head
yann300 8 years ago
parent 32db5ed01c
commit f0d18b86e4
  1. 6
      src/app.js
  2. 22
      src/app/execution-context.js

@ -899,11 +899,7 @@ var run = function () {
runCompiler()
if (queryParams.get().context) {
executionContext.setContext(queryParams.get().context, false)
}
if (queryParams.get().endpointurl) {
executionContext.setEndPointUrl(queryParams.get().endpointurl)
executionContext.setContext(queryParams.get().context, queryParams.get().endpointurl)
}
if (queryParams.get().debugtx) {

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

Loading…
Cancel
Save