Merge pull request #834 from ethereum/warn_comp_fail

An alert for compiler errors - but UI needs adjustments
pull/1/head
yann300 7 years ago committed by GitHub
commit e6f4dc2185
  1. 22
      src/app/tabs/run-tab.js

@ -169,6 +169,19 @@ var css = csjs`
color: ${styles.colors.orange}; color: ${styles.colors.orange};
margin-left: 10%; margin-left: 10%;
} }
.errorIcon {
color: ${styles.colors.red};;
margin-left: 15px;
}
.errorIcon {
color: ${styles.colors.red};;
margin-left: 15px;
}
.failDesc {
color: ${styles.colors.red};;
padding-left: 10px;
display: inline;
}
` `
module.exports = runTab module.exports = runTab
@ -250,9 +263,14 @@ function updateAccountBalances (container, appAPI) {
function contractDropdown (appAPI, appEvents, instanceContainer) { function contractDropdown (appAPI, appEvents, instanceContainer) {
instanceContainer.appendChild(noInstancesText) instanceContainer.appendChild(noInstancesText)
var compFails = yo`<i title="Contract compilation failed. Please check the compile tab for more information." class="fa fa-thumbs-down ${css.errorIcon}" ></i>`
appEvents.compiler.register('compilationFinished', function (success, data, source) { appEvents.compiler.register('compilationFinished', function (success, data, source) {
getContractNames(success, data) getContractNames(success, data)
if (success) {
compFails.style.display = 'none'
} else {
compFails.style.display = 'block'
}
}) })
var atAddressButtonInput = yo`<input class="${css.input} ataddressinput" placeholder="Enter contract's address - i.e. 0x60606..." title="atAddress" />` var atAddressButtonInput = yo`<input class="${css.input} ataddressinput" placeholder="Enter contract's address - i.e. 0x60606..." title="atAddress" />`
@ -261,7 +279,7 @@ function contractDropdown (appAPI, appEvents, instanceContainer) {
var el = yo` var el = yo`
<div class="${css.container}"> <div class="${css.container}">
<div class="${css.subcontainer}"> <div class="${css.subcontainer}">
${selectContractNames} ${selectContractNames} ${compFails}
</div> </div>
<div class="${css.buttons}"> <div class="${css.buttons}">
<div class="${css.button}"> <div class="${css.button}">

Loading…
Cancel
Save