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
9f0e6732
Commit
9f0e6732
authored
Aug 08, 2017
by
yann300
Committed by
GitHub
Aug 08, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #662 from ethereum/compileRunTab5
Compile run tab - 5
parents
1067e2de
c4b63e5b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
51 deletions
+20
-51
loading-spinner.js
src/app/loading-spinner.js
+0
-26
righthand-panel.js
src/app/righthand-panel.js
+19
-7
tabbed-menu.js
src/app/tabbed-menu.js
+1
-18
No files found.
src/app/loading-spinner.js
deleted
100644 → 0
View file @
1067e2de
var
yo
=
require
(
'yo-yo'
)
// -------------- styling ----------------------
var
csjs
=
require
(
'csjs-inject'
)
module
.
exports
=
loadingSpinner
var
css
=
csjs
`
.loader {
display: inline-block;
margin-left: .3em;
border: 2px solid orange;
border-top: 2px solid #F4F6FF; /* Light blue */
border-radius: 50%;
width: 8px;
height: 8px;
animation: spin 2s linear infinite;
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
`
function
loadingSpinner
()
{
var
el
=
yo
`<div class=
${
css
.
loader
}
></div>`
return
el
}
src/app/righthand-panel.js
View file @
9f0e6732
var
csjs
=
require
(
'csjs-inject'
)
var
yo
=
require
(
'yo-yo'
)
var
EventManager
=
require
(
'ethereum-remix'
).
lib
.
EventManager
var
tabbedMenu
=
require
(
'./tabbed-menu'
)
var
compileTab
=
require
(
'./compile-tab'
)
var
runTab
=
require
(
'./run-tab'
)
var
settingsTab
=
require
(
'./settings-tab'
)
var
analysisTab
=
require
(
'./analysis-tab'
)
var
debuggerTab
=
require
(
'./debugger-tab'
)
var
filesTab
=
require
(
'./files-tab'
)
// -------------- styling ----------------------
var
csjs
=
require
(
'csjs-inject'
)
var
styleGuide
=
require
(
'./style-guide'
)
var
styles
=
styleGuide
()
var
css
=
csjs
`
.options {
float: left;
padding
: 0.7em 0.3
em;
min-width: 6
5
px;
padding
-top: 0.7
em;
min-width: 6
0
px;
font-size: 0.9em;
cursor: pointer;
background-color: transparent;
margin-right: 0.5em;
background-color:
${
styles
.
colors
.
transparent
}
;
font-size: 1em;
text-align: center;
}
.dragbar {
position : absolute;
...
...
@@ -40,6 +46,9 @@ var css = csjs`
.panel {
height : 100%;
}
.header {
height : 100%;
}
`
// ------------------------------------------------------------------
...
...
@@ -55,7 +64,8 @@ function RighthandPanel (appAPI, events, opts) {
var
optionViews
=
yo
`<div id="optionViews" class="settingsView"></div>`
var
options
=
yo
`
<ul id="options">
<li class="envView" title="Environment">Contract</li>
<li class="compileView" title="Compile">Compile</li>
<li class="runView" title="Run">Run</li>
<li class="settingsView" title="Settings">Settings</li>
<li class="publishView" title="Publish" >Files</li>
<li class="debugView" title="Debugger">Debugger</li>
...
...
@@ -67,7 +77,7 @@ function RighthandPanel (appAPI, events, opts) {
self
.
_view
.
element
=
yo
`
<div id="righthand-panel" class=
${
css
.
panel
}
>
${
self
.
_view
.
dragbar
}
<div id="header">
<div id="header"
class=
${
css
.
header
}
>
<div id="menu">
<img id="solIcon" title="Solidity realtime compiler and runtime" src="assets/img/remix_logo_512x512.svg" alt="Solidity realtime compiler and runtime">
${
options
}
...
...
@@ -76,6 +86,8 @@ function RighthandPanel (appAPI, events, opts) {
</div>
</div>
`
compileTab
(
optionViews
,
appAPI
,
events
,
opts
)
runTab
(
optionViews
,
appAPI
,
events
,
opts
)
settingsTab
(
optionViews
,
appAPI
,
events
,
opts
)
analysisTab
(
optionViews
,
appAPI
,
events
,
opts
)
debuggerTab
(
optionViews
,
appAPI
,
events
,
opts
)
...
...
src/app/tabbed-menu.js
View file @
9f0e6732
var
$
=
require
(
'jquery'
)
var
loadingSpinner
=
require
(
'./loading-spinner'
)
module
.
exports
=
tabbedMenu
...
...
@@ -14,23 +13,7 @@ function tabbedMenu (container, appAPI, events, opts) {
})
// initialize tabbed menu
selectTab
(
container
.
querySelector
(
'.envView'
))
// add event listeners for loading spinner
events
.
compiler
.
register
(
'loadingCompiler'
,
function
start
()
{
var
settingsTab
=
document
.
querySelector
(
'.settingsView'
)
if
(
settingsTab
.
children
.
length
)
return
var
spinner
=
loadingSpinner
()
settingsTab
.
appendChild
(
spinner
)
appAPI
.
warnCompilerLoading
(
'Solidity compiler is currently loading. Please wait a moment...'
)
events
.
compiler
.
register
(
'compilerLoaded'
,
finish
)
function
finish
()
{
events
.
compiler
.
unregister
(
'compilerLoaded'
,
finish
)
settingsTab
.
removeChild
(
spinner
)
}
})
selectTab
(
container
.
querySelector
(
'.compileView'
))
// select tab
function
selectTab
(
el
)
{
...
...
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