Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
26416340
Commit
26416340
authored
Nov 03, 2016
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
integrate to app, renderer
parent
9bde45fd
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
9 deletions
+35
-9
browser-solidity.css
assets/css/browser-solidity.css
+17
-0
index.html
index.html
+3
-0
app.js
src/app.js
+5
-1
renderer.js
src/app/renderer.js
+9
-7
staticAnalysisView.js
src/app/staticanalysis/staticAnalysisView.js
+1
-1
No files found.
assets/css/browser-solidity.css
View file @
26416340
...
...
@@ -228,6 +228,10 @@ body {
display
:
block
;
}
#header
#optionViews
.staticanalysisView
#staticanalysisView
{
display
:
block
;
}
#header
#optionViews
.txView
input
,
#header
#optionViews
.txView
select
{
max-width
:
13em
;
...
...
@@ -283,6 +287,19 @@ body {
cursor
:
pointer
;
}
#staticanalysisView
button
{
background-color
:
#C6CFF7
;
font-size
:
12px
;
padding
:
0.25em
;
margin-bottom
:
.5em
;
color
:
black
;
border
:
0
none
;
border-radius
:
3px
;
width
:
8em
;
margin-right
:
1em
;
cursor
:
pointer
;
}
#header
.origin
,
#header
#executionContext
{
display
:
block
;
...
...
index.html
View file @
26416340
...
...
@@ -61,6 +61,7 @@
<li
class=
"publishView"
title=
"Publish"
><i
class=
"fa fa-cloud-upload"
></i></li>
<li
class=
"debugView"
title=
"Debugger"
><i
class=
"fa fa-bug"
></i></li>
<li
class=
"verificationView"
title=
"Formal Verification"
><i
class=
"fa fa-check"
></i></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>
<img
id=
"solIcon"
title=
"Solidity realtime compiler and runtime"
src=
"assets/img/sol.svg"
alt=
"Solidity realtime compiler and runtime"
>
...
...
@@ -123,6 +124,8 @@
<div
id=
"debugView"
>
<div
id=
"debugger"
></div>
</div>
<div
id=
"staticanalysisView"
>
</div>
<div
id=
"verificationView"
>
<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,
...
...
src/app.js
View file @
26416340
...
...
@@ -19,6 +19,7 @@ var UniversalDApp = require('./universal-dapp.js')
var
Debugger
=
require
(
'./app/debugger'
)
var
FormalVerification
=
require
(
'./app/formalVerification'
)
var
EventManager
=
require
(
'./lib/eventManager'
)
var
StaticAnalysis
=
require
(
'./app/staticanalysis/staticAnalysisView'
)
// The event listener needs to be registered as early as possible, because the
// parent will send the message upon the "load" event.
...
...
@@ -444,6 +445,9 @@ var run = function () {
var
renderer
=
new
Renderer
(
editor
,
executionContext
.
web3
(),
updateFiles
,
udapp
,
executionContext
,
formalVerification
.
event
,
compiler
.
event
)
// eslint-disable-line
var
staticanalysis
=
new
StaticAnalysis
(
compiler
,
renderer
)
$
(
'#staticanalysisView'
).
append
(
staticanalysis
.
render
())
var
autoCompile
=
document
.
querySelector
(
'#autoCompile'
).
checked
document
.
querySelector
(
'#autoCompile'
).
addEventListener
(
'change'
,
function
()
{
...
...
@@ -609,7 +613,7 @@ var run = function () {
selectedVersion
=
queryParams
.
get
().
version
}
loadVersion
(
selectedVersion
)
loadVersion
(
selectedVersion
)
}).
fail
(
function
(
xhr
,
text
,
err
)
{
// loading failed for some reason, fall back to local compiler
$
(
'#versionSelector'
).
append
(
new
Option
(
'latest local version'
,
'builtin'
))
...
...
src/app/renderer.js
View file @
26416340
...
...
@@ -35,9 +35,11 @@ function Renderer (editor, web3, updateFiles, udapp, executionContext, formalVer
})
}
Renderer
.
prototype
.
error
=
function
(
message
,
container
,
noAnnotations
)
{
Renderer
.
prototype
.
error
=
function
(
message
,
container
,
noAnnotations
,
type
)
{
var
self
=
this
var
type
=
utils
.
errortype
(
message
)
if
(
!
type
)
{
type
=
utils
.
errortype
(
message
)
}
var
$pre
=
$
(
'<pre />'
).
text
(
message
)
var
$error
=
$
(
'<div class="sol '
+
type
+
'"><div class="close"><i class="fa fa-close"></i></div></div>'
).
prepend
(
$pre
)
if
(
container
===
undefined
)
{
...
...
@@ -66,12 +68,12 @@ Renderer.prototype.error = function (message, container, noAnnotations) {
}
self
.
editor
.
handleErrorClick
(
errLine
,
errCol
)
})
$error
.
find
(
'.close'
).
click
(
function
(
ev
)
{
ev
.
preventDefault
()
$error
.
remove
()
return
false
})
}
$error
.
find
(
'.close'
).
click
(
function
(
ev
)
{
ev
.
preventDefault
()
$error
.
remove
()
return
false
})
}
Renderer
.
prototype
.
contracts
=
function
(
data
,
source
)
{
...
...
src/app/staticanalysis/staticAnalysisView.js
View file @
26416340
...
...
@@ -57,7 +57,7 @@ staticAnalysisView.prototype.run = function () {
}
var
selected
=
this
.
selectedModules
()
var
warningContainer
=
$
(
'#staticanalysisresult'
)
warningContainer
.
html
(
''
)
warningContainer
.
empty
(
)
if
(
this
.
lastASTs
)
{
var
self
=
this
this
.
runner
.
run
(
this
.
lastASTs
,
selected
,
function
(
results
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment