Merge pull request #536 from ethereum/link

Update index.html
pull/1/head
yann300 8 years ago committed by GitHub
commit 455db8ef02
  1. 4
      index.html
  2. 4
      src/universal-dapp.js

@ -27,7 +27,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<meta http-equiv="X-UA-Compatible" content="chrome=1"> <meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>Remix</title> <title>Remix - Solidity IDE</title>
<link rel="stylesheet" href="assets/css/styles.css"> <link rel="stylesheet" href="assets/css/styles.css">
<link rel="stylesheet" href="assets/css/pygment_trac.css"> <link rel="stylesheet" href="assets/css/pygment_trac.css">
<link rel="stylesheet" href="assets/css/universal-dapp.css"> <link rel="stylesheet" href="assets/css/universal-dapp.css">
@ -62,7 +62,7 @@
<li class="envView" title="Environment">Contract</li> <li class="envView" title="Environment">Contract</li>
<li class="debugView" title="Debugger">Debugger</li> <li class="debugView" title="Debugger">Debugger</li>
<li class="staticanalysisView" title="Static Analysis">Analysis</li> <li class="staticanalysisView" title="Static Analysis">Analysis</li>
<li id="helpButton"><a href="https://solidity.readthedocs.org" target="_blank" title="Open Documentation">Docs</a></li> <li id="helpButton"><a href="https://remix.readthedocs.org" target="_blank" title="Open Documentation">Docs</a></li>
</ul> </ul>
</div> </div>
<div id="optionViews" class="settingsView"> <div id="optionViews" class="settingsView">

@ -686,11 +686,11 @@ UniversalDApp.prototype.getCallButton = function (args) {
replaceOutput($result, $('<span/>').text(err).addClass('error')) replaceOutput($result, $('<span/>').text(err).addClass('error'))
// VM only // VM only
} else if (self.executionContext.isVM() && result.vm.exception === 0 && result.vm.exceptionError) { } else if (self.executionContext.isVM() && result.vm.exception === 0 && result.vm.exceptionError) {
replaceOutput($result, $('<span/>').text('VM Exception: ' + result.vm.exceptionError).addClass('error')) replaceOutput($result, $('<span/>').text('Exception during execution. (' + result.vm.exceptionError + '). Please debug the transaction for more information.').addClass('error'))
$result.append(getDebugTransaction(txResult)) $result.append(getDebugTransaction(txResult))
// VM only // VM only
} else if (self.executionContext.isVM() && result.vm.return === undefined) { } else if (self.executionContext.isVM() && result.vm.return === undefined) {
replaceOutput($result, $('<span/>').text('Exception during execution.').addClass('error')) replaceOutput($result, $('<span/>').text('Exception during execution. Please debug the transaction for more information.').addClass('error'))
$result.append(getDebugTransaction(txResult)) $result.append(getDebugTransaction(txResult))
} else if (isConstructor) { } else if (isConstructor) {
replaceOutput($result, getGasUsedOutput(result, result.vm)) replaceOutput($result, getGasUsedOutput(result, result.vm))

Loading…
Cancel
Save