Skip to content

B
baas-ide
Commit bd91b6c1 authored by yann300's avatar yann300 Committed by GitHub
Browse files
Options

Merge pull request #496 from ninabreznik/righthand-panel

Rename and restructure tabs and content in righthand panel
parents 5e08b5f8 fad5c5e6
Show whitespace changes
Inline Side-by-side
Showing with 176 additions and 132 deletions
assets/css/browser-solidity.css
View file @ bd91b6c1
...@@ -149,10 +149,12 @@ body { ...@@ -149,10 +149,12 @@ body {
#output { #output {
display: block; display: block;
padding: 1em;
} }
#header { #header {
font-size: 12px; font-size: 13px;
height: 100%;
} }
#header #solIcon { #header #solIcon {
...@@ -165,7 +167,7 @@ body { ...@@ -165,7 +167,7 @@ body {
border-bottom: 3px solid #F4F6FF; border-bottom: 3px solid #F4F6FF;
overflow: hidden; overflow: hidden;
height: 2em; height: 2em;
font-size: 1.25em; font-size: 1em;
padding-top: 0.5em; padding-top: 0.5em;
box-sizing: content-box; box-sizing: content-box;
} }
...@@ -176,15 +178,6 @@ body { ...@@ -176,15 +178,6 @@ body {
padding: 0; padding: 0;
} }
#header #options li {
float: left;
padding: 0.3em 0.6em;
font-size: 1em;
cursor: pointer;
background-color: transparent;
margin-right: 0.5em;
}
#header #options li.active { #header #options li.active {
background-color: #F4F6FF; background-color: #F4F6FF;
} }
...@@ -197,11 +190,12 @@ body { ...@@ -197,11 +190,12 @@ body {
clear: both; clear: both;
overflow: auto; overflow: auto;
background-color: #F4F6FF; background-color: #F4F6FF;
height: 100%;
} }
#header #optionViews > div { #header #optionViews > div {
display: none; display: none;
padding: 1em 0.5em 0.5em; padding: .5em .5em .5em;
} }
#header #optionViews.txView #txView { #header #optionViews.txView #txView {
...@@ -214,6 +208,7 @@ body { ...@@ -214,6 +208,7 @@ body {
#header #optionViews.publishView #publishView { #header #optionViews.publishView #publishView {
display: block; display: block;
padding: 3em;
} }
#header #optionViews.envView #envView { #header #optionViews.envView #envView {
...@@ -222,6 +217,7 @@ body { ...@@ -222,6 +217,7 @@ body {
#header #optionViews.debugView #debugView { #header #optionViews.debugView #debugView {
display: block; display: block;
padding: 3em;
} }
#header #optionViews.verificationView #verificationView { #header #optionViews.verificationView #verificationView {
...@@ -230,6 +226,8 @@ body { ...@@ -230,6 +226,8 @@ body {
#header #optionViews.staticanalysisView #staticanalysisView { #header #optionViews.staticanalysisView #staticanalysisView {
display: block; display: block;
padding: 3em;
line-height: 1.5em;
} }
#header #optionViews.txView input, #header #optionViews.txView input,
...@@ -243,7 +241,7 @@ body { ...@@ -243,7 +241,7 @@ body {
#header #optionViews .pre { #header #optionViews .pre {
word-wrap: break-word; word-wrap: break-word;
background-color: #C6CFF7; background-color: rgba(255, 255, 255, 0.5);
font-family: monospace; font-family: monospace;
border-radius: 3px; border-radius: 3px;
display: inline-block; display: inline-block;
...@@ -265,12 +263,11 @@ body { ...@@ -265,12 +263,11 @@ body {
background-color: #C6CFF7; background-color: #C6CFF7;
font-size: 12px; font-size: 12px;
padding: 0.25em; padding: 0.25em;
margin-bottom: .5em; margin: 3em 1em .5em 0;
color: black; color: black;
border:0 none; border:0 none;
border-radius: 3px; border-radius: 3px;
width: 8em; width: 8em;
margin-right: 1em;
cursor: pointer; cursor: pointer;
} }
...@@ -291,12 +288,11 @@ body { ...@@ -291,12 +288,11 @@ body {
background-color: #C6CFF7; background-color: #C6CFF7;
font-size: 12px; font-size: 12px;
padding: 0.25em; padding: 0.25em;
margin-bottom: .5em; margin: 2em 1em .5em 0;
color: black; color: black;
border:0 none; border:0 none;
border-radius: 3px; border-radius: 3px;
width: 8em; width: 8em;
margin-right: 1em;
cursor: pointer; cursor: pointer;
} }
...@@ -321,12 +317,28 @@ body { ...@@ -321,12 +317,28 @@ body {
#header #executionContext { #header #executionContext {
display: block; display: block;
word-wrap: break-word; word-wrap: break-word;
padding: 1.5em;
font-weight: bold;
}
#selectExEnv {
text-decoration: none;
background-color: #C6CFF7;
cursor: pointer;
font-size: 12px;
color: black;
border-radius: 3px;
border: 0 none;
} }
#header #versionSelector { #header #versionSelector {
text-decoration: none;
background-color: #C6CFF7;
cursor: pointer;
font-size: 12px;
color: black;
border-radius: 3px;
border: 0 none; border: 0 none;
font-family: monospace;
background-color: transparent;
} }
.col1 { .col1 {
...@@ -345,9 +357,6 @@ body { ...@@ -345,9 +357,6 @@ body {
.contract.hide { .contract.hide {
padding-bottom: 0; padding-bottom: 0;
}
.contract.hide {
margin: 0; margin: 0;
} }
...@@ -364,6 +373,7 @@ body { ...@@ -364,6 +373,7 @@ body {
opacity: 0.5; opacity: 0.5;
margin-right: 0.4em; margin-right: 0.4em;
font-size: 10px; font-size: 10px;
margin-top: 0.2em;
} }
.contract.hide > .title:before { .contract.hide > .title:before {
...@@ -380,7 +390,18 @@ body { ...@@ -380,7 +390,18 @@ body {
overflow: auto; overflow: auto;
display: block; display: block;
clear: both; clear: both;
margin: 0.5em; margin: 1.5em;
font-weight: bold;
}
.crow #txorigin {
text-decoration: none;
background-color: #C6CFF7;
cursor: pointer;
font-size: 12px;
color: black;
border-radius: 3px;
border: 0 none;
} }
.contractDetails button { .contractDetails button {
......
assets/css/universal-dapp.css
View file @ bd91b6c1
.udapp { .udapp {
padding: 1em; padding: .5em;
border: 1px dotted #4D5686; border: 1px dotted #4D5686;
position: relative; position: relative;
box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
} }
.udapp .contract { .udapp .contract {
margin-bottom: 1em;
clear: both; clear: both;
} }
...@@ -53,19 +52,24 @@ ...@@ -53,19 +52,24 @@
.udapp .title { .udapp .title {
margin-bottom: 0.4em; margin-bottom: 0.4em;
padding: 0.2em; padding: 1em;
background-color: rgba(255, 255, 255, 0.5); background-color: #C6CFF7;
display: block;
font-weight: bold; font-weight: bold;
padding-right: 2em; display: flex;
justify-content: space-between;
word-wrap: break-word; word-wrap: break-word;
position: relative; position: relative;
border-radius: 3px;
} }
.udapp .definitionTitle {
background-color: #C6CFD9;
}
.udapp .title:hover {
opacity: 0.8;
}
.udapp .title .size { .udapp .title .size {
position: absolute;
right: 2.2em;
top: 0.2em;
font-weight: normal; font-weight: normal;
} }
...@@ -142,6 +146,7 @@ ...@@ -142,6 +146,7 @@
} }
.udapp .instance .title { .udapp .instance .title {
content: "\25BC";
cursor: pointer; cursor: pointer;
} }
...@@ -156,6 +161,7 @@ ...@@ -156,6 +161,7 @@
opacity: 0.5; opacity: 0.5;
margin-right: 0.4em; margin-right: 0.4em;
font-size: 10px; font-size: 10px;
margin-top: 0.2em;
} }
.udapp .instance.hide > *:not(.title) { .udapp .instance.hide > *:not(.title) {
......
index.html
View file @ bd91b6c1
...@@ -57,79 +57,79 @@ ...@@ -57,79 +57,79 @@
<div id="header"> <div id="header">
<div id="menu"> <div id="menu">
<ul id="options"> <ul id="options">
<li class="settingsView active" title="Settings"><i class="fa fa-gear"></i></li> <li class="settingsView active" title="Settings">Settings</li>
<li class="txView" title="Transaction"><i class="fa fa-send"></i></li> <li class="publishView" title="Publish" >Files</li>
<li class="envView" title="Environment"><i class="fa fa-cube"></i></li> <li class="envView" title="Environment">Contract</li>
<li class="publishView" title="Publish" ><i class="fa fa-cloud-upload"></i></li> <li class="debugView" title="Debugger">Debugger</li>
<li class="debugView" title="Debugger"><i class="fa fa-bug"></i></li> <li class="staticanalysisView" title="Static Analysis">Analysis</li>
<li class="verificationView" title="Formal Verification"><i class="fa fa-check"></i></li> <li id="helpButton"><a href="https://solidity.readthedocs.org" target="_blank" title="Open Documentation">Docs</a></li>
<li class="staticanalysisView" title="Static Analysis"><i class="fa fa-search"></i></li>
<li id="helpButton"><a href="https://solidity.readthedocs.org" target="_blank" title="Open Documentation" class="fa fa-question"></a></li>
</ul> </ul>
<img id="solIcon" title="Solidity realtime compiler and runtime" src="assets/img/remix_logo_512x512.svg" alt="Solidity realtime compiler and runtime"> <img id="solIcon" title="Solidity realtime compiler and runtime" src="assets/img/remix_logo_512x512.svg" alt="Solidity realtime compiler and runtime">
</div> </div>
<div id="optionViews" class="settingsView"> <div id="optionViews" class="settingsView">
<div id="txView"> <div id="txView"></div>
<div class="crow">
<label for="txorigin"><select name="txorigin" id="txorigin"></select> Transaction origin</label>
</div>
<div class="crow">
<label for="gasLimit"><input type="number" id="gasLimit" value="3000000"> Transaction gas limit</label>
</div>
<div class="crow hide">
<label for="gasPrice"><input type="number" id="gasPrice" value="0"> Gas Price</label>
</div>
<div class="crow">
<label for="value"><input type="text" id="value" value="0"> Value (e.g. .7 ether or 5 wei, defaults to ether)</label>
</div>
</div>
<div id="settingsView"> <div id="settingsView">
<div class="version crow"><strong>Solidity version:</strong> <span id="version">(loading)</span></div> <div class="version crow"><strong>Current Solidity version:</strong> <span id="version">( Loading... )</span></div>
<div class="crow">Change to: <select id="versionSelector"></select></div> <div class="crow">Switch version: <select id="versionSelector"></select></div>
<div class="crow"> <div class="crow">
<label for="editorWrap"><input id="editorWrap" type="checkbox">Text Wrap</label> <label for="editorWrap"><input id="editorWrap" type="checkbox">Text Wrap</label>
<label for="optimize"><input id="optimize" type="checkbox">Enable Optimization</label> <label for="optimize"><input id="optimize" type="checkbox">Enable Optimization</label>
<label for="autoCompile"><input id="autoCompile" type="checkbox" checked>Auto Compile</label> <label for="autoCompile"><input id="autoCompile" type="checkbox" checked>Auto Compile</label>
<button id="compile" title="Compile source code"><i class="fa fa-cog"></i> Compile</button> <button id="compile" title="Compile source code">Compile</button>
</div> </div>
</div> </div>
<div id="publishView"> <div id="publishView">
<p> <p>
<button id="gist" title="Publish all files as public gist on github.com"><i class="fa fa-github"></i> Publish Gist</button> Publish all open files to an anonymous github gist.<br/> <button id="gist" title="Publish all files as public gist on github.com"><i class="fa fa-github"></i> Publish Gist</button>Publish all open files to an anonymous github gist.<br/>
<button id="copyOver" title="Copy all files to another instance of browser-solidity.">Copy files</button> Copy all files to another instance of browser-solidity. <button id="copyOver" title="Copy all files to another instance of browser-solidity.">Copy files</button> Copy all files to another instance of Browser-solidity.
</p> </p>
<p>You can also load a gist by adding the following <span class="pre">#gist=GIST_ID</span> to your url, where GIST_ID is the id of the gist to load.</p> <p>You can also load a gist by adding the following <span class="pre">#gist=GIST_ID</span> to your url, where GIST_ID is the id of the gist to load.</p>
</div> </div>
<div id="envView"> <div id="envView">
<div class="crow">
<label for="txorigin">Transaction origin:<select name="txorigin" id="txorigin"></select></label>
</div>
<div class="crow">
<label for="gasLimit"><input type="number" id="gasLimit" value="3000000"> Transaction gas limit</label>
</div>
<div class="crow hide">
<label for="gasPrice"><input type="number" id="gasPrice" value="0"> Gas Price</label>
</div>
<div class="crow">
<label for="value"><input type="text" id="value" value="0"> Value (e.g. .7 ether or 5 wei, defaults to ether)</label>
</div>
<span id="executionContext"> <span id="executionContext">
<label for="vm-mode"> Select execution environment: <br><br>
<input id="vm-mode" type="radio" value="vm" checked name="executionContext"> <select id='selectExEnv'>
<strong>JavaScript VM</strong> <option id="vm-mode"
<p>Execution environment does not connect to any node, everything is local and in memory only.</p> title="Execution environment does not connect to any node, everything is local and in memory only."
</label> value="vm"
<label for="injected-mode"> checked name="executionContext">
<input id="injected-mode" type="radio" value="injected" checked name="executionContext"> JavaScript VM
<strong>Injected Web3</strong> </option>
<p>Execution environment has been provided by Mist or similar provider.</p> <option id="injected-mode"
</label> title="Execution environment has been provided by Mist or similar provider."
<label for="web3-mode"> value="injected"
<input id="web3-mode" type="radio" value="web3" name="executionContext"> checked name="executionContext">
<strong>Web3 Provider</strong> Injected Web3
<p>Execution environment connects to node at localhost (or via IPC if available), transactions will be sent to the network and can cause loss of money or worse!<br/> </option>
<b>If this page is served via https and you access your node via http, it might not work. In this case, try cloning the repository and serving it via http.</b></p> <option id="web3-mode"
<label for="web3Endpoint"> title="Execution environment connects to node at localhost (or via IPC if available), transactions will be sent to the network and can cause loss of money or worse!
<strong>Web3 Provider Endpoint</strong>: <input type="text" id="web3Endpoint" value="http://localhost:8545"> If this page is served via https and you access your node via http, it might not work. In this case, try cloning the repository and serving it via http."
</label> value="web3"
</label> name="executionContext">
Web3 Provider
</option>
</select>
</span> </span>
<div id="output"></div>
</div> </div>
<div id="debugView"> <div id="debugView">
<div id="debugger" ></div> <div id="debugger"></div>
</div> </div>
<div id="staticanalysisView"> <div id="staticanalysisView">
</div> <p>
<div id="verificationView"> This tab provides support for <b>formal verification</b> of Solidity contracts.<br/>
<p>This tab provides support for <b>formal verification</b> of Solidity contracts.<br/>
This feature is still in development and thus also not yet well documented, This feature is still in development and thus also not yet well documented,
but you can find some information but you can find some information
<a href="http://solidity.readthedocs.io/en/latest/security-considerations.html#formal-verification">here</a>. <a href="http://solidity.readthedocs.io/en/latest/security-considerations.html#formal-verification">here</a>.
...@@ -137,13 +137,13 @@ ...@@ -137,13 +137,13 @@
(or report errors). Please paste the text below into (or report errors). Please paste the text below into
<a href="http://why3.lri.fr/try/">http://why3.lri.fr/try/</a> <a href="http://why3.lri.fr/try/">http://why3.lri.fr/try/</a>
to actually perform the verification. to actually perform the verification.
We plan to support direct integration in the future.</p> We plan to support direct integration in the future.
</p>
<textarea id="formalVerificationInput" readonly="readonly"></textarea> <textarea id="formalVerificationInput" readonly="readonly"></textarea>
<div id="formalVerificationErrors"></div> <div id="formalVerificationErrors"></div>
</div> </div>
</div> </div>
</div> </div>
<div id="output"></div>
</div> </div>
<script src="build/app.js"></script> <script src="build/app.js"></script>
......
package.json
View file @ bd91b6c1
...@@ -67,7 +67,8 @@ ...@@ -67,7 +67,8 @@
"watchify": "^3.9.0", "watchify": "^3.9.0",
"web3": "^0.18.0", "web3": "^0.18.0",
"webworkify": "^1.2.1", "webworkify": "^1.2.1",
"yo-yo": "^1.2.2" "yo-yo": "^1.2.2",
"csjs-inject": "^1.0.1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
......
src/app.js
View file @ bd91b6c1
...@@ -858,7 +858,7 @@ var run = function () { ...@@ -858,7 +858,7 @@ var run = function () {
}) })
compiler.event.register('loadingCompiler', this, function (url, usingWorker) { compiler.event.register('loadingCompiler', this, function (url, usingWorker) {
setVersionText(usingWorker ? '(loading using worker)' : '(loading)') setVersionText(usingWorker ? '(loading using worker)' : '( Loading... Please, wait a moment. )')
}) })
compiler.event.register('compilerLoaded', this, function (version) { compiler.event.register('compilerLoaded', this, function (version) {
...@@ -940,7 +940,7 @@ var run = function () { ...@@ -940,7 +940,7 @@ var run = function () {
loadVersion($('#versionSelector').val()) loadVersion($('#versionSelector').val())
}) })
var header = new Option('Select new compiler version to load') var header = new Option('Click to select new compiler version')
header.disabled = true header.disabled = true
header.selected = true header.selected = true
$('#versionSelector').append(header) $('#versionSelector').append(header)
......
src/app/execution-context.js
View file @ bd91b6c1
/* global confirm */ /* global confirm, prompt */
'use strict' 'use strict'
var $ = require('jquery') var $ = require('jquery')
...@@ -94,43 +94,25 @@ function ExecutionContext () { ...@@ -94,43 +94,25 @@ function ExecutionContext () {
this.setContext = function (context) { this.setContext = function (context) {
executionContext = context executionContext = context
executionContextChange(context) executionContextChange(context)
setExecutionContextRadio()
} }
var $injectedToggle = $('#injected-mode')
var $vmToggle = $('#vm-mode')
var $web3Toggle = $('#web3-mode')
var $web3endpoint = $('#web3Endpoint') var $web3endpoint = $('#web3Endpoint')
if (web3.providers && web3.currentProvider instanceof web3.providers.IpcProvider) { if (web3.providers && web3.currentProvider instanceof web3.providers.IpcProvider) {
$web3endpoint.val('ipc') $web3endpoint.val('ipc')
} }
setExecutionContextRadio()
$injectedToggle.on('change', executionContextUIChange)
$vmToggle.on('change', executionContextUIChange)
$web3Toggle.on('change', executionContextUIChange)
$web3endpoint.on('change', function () {
setProviderFromEndpoint()
if (executionContext === 'web3') {
self.event.trigger('web3EndpointChanged')
}
})
function executionContextUIChange (ev) {
executionContextChange(ev.target.value)
}
function executionContextChange (context) { function executionContextChange (context) {
if (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 a local ethereum node?')) {
setExecutionContextRadio() return false
} else if (context === 'injected' && injectedProvider === undefined) { } else if (context === 'injected' && injectedProvider === undefined) {
setExecutionContextRadio() return false
} else { } else {
if (context === 'web3') { if (context === 'web3') {
executionContext = context executionContext = context
setProviderFromEndpoint() var endpoint = prompt('Please type Web3 Provider Endpoint', 'http://localhost:8545')
setProviderFromEndpoint(endpoint)
self.event.trigger('web3EndpointChanged')
self.event.trigger('contextChanged', ['web3']) self.event.trigger('contextChanged', ['web3'])
} else if (context === 'injected') { } else if (context === 'injected') {
executionContext = context executionContext = context
...@@ -143,11 +125,11 @@ function ExecutionContext () { ...@@ -143,11 +125,11 @@ function ExecutionContext () {
}) })
self.event.trigger('contextChanged', ['vm']) self.event.trigger('contextChanged', ['vm'])
} }
return true
} }
} }
function setProviderFromEndpoint () { function setProviderFromEndpoint (endpoint) {
var endpoint = $web3endpoint.val()
if (endpoint === 'ipc') { if (endpoint === 'ipc') {
web3.setProvider(new web3.providers.IpcProvider()) web3.setProvider(new web3.providers.IpcProvider())
} else { } else {
...@@ -155,15 +137,18 @@ function ExecutionContext () { ...@@ -155,15 +137,18 @@ function ExecutionContext () {
} }
} }
function setExecutionContextRadio () { /* ---------------------------------------------------------------------------
if (executionContext === 'injected') { DROPDOWN
$injectedToggle.get(0).checked = true --------------------------------------------------------------------------- */
} else if (executionContext === 'vm') {
$vmToggle.get(0).checked = true var selectExEnv = document.querySelector('#selectExEnv')
} else if (executionContext === 'web3') { selectExEnv.addEventListener('change', function (event) {
$web3Toggle.get(0).checked = true if (!executionContextChange(selectExEnv.options[selectExEnv.selectedIndex].value)) {
} selectExEnv.value = executionContext
} }
})
selectExEnv.value = executionContext
} }
module.exports = ExecutionContext module.exports = ExecutionContext
src/app/renderer.js
View file @ bd91b6c1
...@@ -16,6 +16,10 @@ function Renderer (appAPI, formalVerificationEvent, compilerEvent) { ...@@ -16,6 +16,10 @@ function Renderer (appAPI, formalVerificationEvent, compilerEvent) {
$('#output').empty() $('#output').empty()
if (success) { if (success) {
self.contracts(data, source) self.contracts(data, source)
$('#header #menu .envView').css('color', '')
} else {
// envView is the `Contract` tab, as a refactor the entire envView should have his own module
$('#header #menu .envView').css('color', '#FF8B8B')
} }
// NOTE: still need to display as there might be warnings // NOTE: still need to display as there might be warnings
......
src/app/staticanalysis/staticAnalysisView.js
View file @ bd91b6c1
...@@ -3,6 +3,14 @@ var StaticAnalysisRunner = require('./staticAnalysisRunner.js') ...@@ -3,6 +3,14 @@ var StaticAnalysisRunner = require('./staticAnalysisRunner.js')
var yo = require('yo-yo') var yo = require('yo-yo')
var $ = require('jquery') var $ = require('jquery')
var utils = require('../utils') var utils = require('../utils')
var csjs = require('csjs-inject')
var css = csjs`
.analysis {
margin-top: 2em;
font-height: 1.5em;
}
`
function staticAnalysisView (appAPI, compilerEvent) { function staticAnalysisView (appAPI, compilerEvent) {
this.view = null this.view = null
...@@ -25,7 +33,7 @@ function staticAnalysisView (appAPI, compilerEvent) { ...@@ -25,7 +33,7 @@ function staticAnalysisView (appAPI, compilerEvent) {
staticAnalysisView.prototype.render = function () { staticAnalysisView.prototype.render = function () {
var self = this var self = this
var view = yo`<div> var view = yo`<div class="${css.analysis}">
<strong>Static Analysis</strong> <strong>Static Analysis</strong>
<label for="autorunstaticanalysis"><input id="autorunstaticanalysis" type="checkbox" style="vertical-align:bottom" checked="true">Auto run</label> <label for="autorunstaticanalysis"><input id="autorunstaticanalysis" type="checkbox" style="vertical-align:bottom" checked="true">Auto run</label>
<div id="staticanalysismodules"> <div id="staticanalysismodules">
...@@ -99,22 +107,22 @@ function renderModules (modules) { ...@@ -99,22 +107,22 @@ function renderModules (modules) {
return Object.keys(groupedModules).map((categoryId, i) => { return Object.keys(groupedModules).map((categoryId, i) => {
var category = groupedModules[categoryId] var category = groupedModules[categoryId]
var entriesDom = category.map((item, i) => { var entriesDom = category.map((item, i) => {
return yo`<label> return yo`
<label>
<input id="staticanalysismodule_${categoryId}_${i}" <input id="staticanalysismodule_${categoryId}_${i}"
type="checkbox" type="checkbox"
name="staticanalysismodule" name="staticanalysismodule"
index=${item._index} index=${item._index}
checked="true" style="vertical-align:bottom">${item.name} (${item.description}) checked="true" style="vertical-align:bottom">
</label>` ${item.name}
${item.description}
</label>
`
}) })
return yo`<div> return yo`<div>
<br>
<label> <label>
<b>${category[0].categoryDisplayName}</b> ( <b>${category[0].categoryDisplayName}</b>
<input id="staticanalysismodule_${categoryId}"
type="checkbox"
checked="true"
style="vertical-align:bottom; margin-left:0"
onchange=${function () { $('[id^=' + this.id + ']').prop('checked', this.checked) }}/> all/none)
</label> </label>
${entriesDom} ${entriesDom}
</div>` </div>`
...@@ -129,4 +137,3 @@ function preProcessModules (arr) { ...@@ -129,4 +137,3 @@ function preProcessModules (arr) {
return item return item
}) })
} }
src/universal-dapp.js
View file @ bd91b6c1
...@@ -9,6 +9,21 @@ var EventManager = require('./lib/eventManager') ...@@ -9,6 +9,21 @@ var EventManager = require('./lib/eventManager')
var crypto = require('crypto') var crypto = require('crypto')
var async = require('async') var async = require('async')
var TxRunner = require('./app/txRunner') var TxRunner = require('./app/txRunner')
var csjs = require('csjs-inject')
var css = csjs`
.options {
float: left;
padding: 0.7em 0.3em;
font-size: 0.9em;
cursor: pointer;
background-color: transparent;
margin-right: 0.5em;
font-size: 1em;
}
`
;[...document.querySelectorAll('#header #options li')].forEach(addCss)
function addCss (el) { el.classList.add(css.options) }
/* /*
trigger debugRequested trigger debugRequested
...@@ -162,6 +177,7 @@ UniversalDApp.prototype.render = function () { ...@@ -162,6 +177,7 @@ UniversalDApp.prototype.render = function () {
} else { } else {
var $title = $('<span class="title"/>').text(self.contracts[c].name) var $title = $('<span class="title"/>').text(self.contracts[c].name)
if (self.contracts[c].bytecode) { if (self.contracts[c].bytecode) {
$title.addClass('definitionTitle')
$title.append($('<div class="size"/>').text((self.contracts[c].bytecode.length / 2) + ' bytes')) $title.append($('<div class="size"/>').text((self.contracts[c].bytecode.length / 2) + ' bytes'))
} }
$contractEl.append($title).append(self.getCreateInterface($contractEl, self.contracts[c])) $contractEl.append($title).append(self.getCreateInterface($contractEl, self.contracts[c]))
......
test-browser/tests/ballot.js
View file @ bd91b6c1
...@@ -26,6 +26,7 @@ module.exports = { ...@@ -26,6 +26,7 @@ module.exports = {
function runTests (browser, testData) { function runTests (browser, testData) {
browser browser
.waitForElementVisible('.newFile', 10000) .waitForElementVisible('.newFile', 10000)
.click('.envView')
contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:Ballot'], function () { contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:Ballot'], function () {
browser.end() browser.end()
}) })
......
test-browser/tests/compiling.js
View file @ bd91b6c1
...@@ -26,6 +26,7 @@ module.exports = { ...@@ -26,6 +26,7 @@ module.exports = {
function runTests (browser) { function runTests (browser) {
browser browser
.waitForElementVisible('.newFile', 10000) .waitForElementVisible('.newFile', 10000)
.click('.envView')
contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:TestContract'], function () { contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:TestContract'], function () {
browser.click('.create .constructor .call') browser.click('.create .constructor .call')
.waitForElementPresent('.instance .call[title="f"]') .waitForElementPresent('.instance .call[title="f"]')
......
test-browser/tests/simpleContract.js
View file @ bd91b6c1
...@@ -25,6 +25,7 @@ module.exports = { ...@@ -25,6 +25,7 @@ module.exports = {
function runTests (browser) { function runTests (browser) {
browser browser
.waitForElementVisible('.newFile', 10000) .waitForElementVisible('.newFile', 10000)
.click('.envView')
contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:test1', 'Untitled:test2'], function () { contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:test1', 'Untitled:test2'], function () {
browser.end() browser.end()
}) })
......
test-browser/tests/staticanalysis.js
View file @ bd91b6c1
...@@ -32,6 +32,7 @@ module.exports = { ...@@ -32,6 +32,7 @@ module.exports = {
function runTests (browser) { function runTests (browser) {
browser browser
.waitForElementVisible('.newFile', 10000) .waitForElementVisible('.newFile', 10000)
.click('.envView')
contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:TooMuchGas', 'Untitled:test1', 'Untitled:test2'], function () { contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:TooMuchGas', 'Untitled:test1', 'Untitled:test2'], function () {
browser browser
.click('.staticanalysisView') .click('.staticanalysisView')
......
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