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
a86f2385
Commit
a86f2385
authored
May 18, 2017
by
ninabreznik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove spinner from contract tab, add warning msg, moved settings tab to second place
parent
777fcf9e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
7 deletions
+26
-7
index.html
index.html
+1
-1
loading-spinner.js
src/app/loading-spinner.js
+6
-1
style-guide.js
src/app/style-guide.js
+5
-4
tabbed-menu.js
src/app/tabbed-menu.js
+14
-1
No files found.
index.html
View file @
a86f2385
...
@@ -58,10 +58,10 @@
...
@@ -58,10 +58,10 @@
<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"
>
<ul
id=
"options"
>
<ul
id=
"options"
>
<li
class=
"envView"
title=
"Environment"
>
Contract
</li>
<li
class=
"envView"
title=
"Environment"
>
Contract
</li>
<li
class=
"settingsView"
title=
"Settings"
>
Settings
</li>
<li
class=
"publishView"
title=
"Publish"
>
Files
</li>
<li
class=
"publishView"
title=
"Publish"
>
Files
</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
class=
"settingsView"
title=
"Settings"
>
Settings
</li>
<li
id=
"helpButton"
><a
href=
"https://solidity.readthedocs.org"
target=
"_blank"
title=
"Open Documentation"
>
Docs
</a></li>
<li
id=
"helpButton"
><a
href=
"https://solidity.readthedocs.org"
target=
"_blank"
title=
"Open Documentation"
>
Docs
</a></li>
</ul>
</ul>
</div>
</div>
...
...
src/app/loading-spinner.js
View file @
a86f2385
var
yo
=
require
(
'yo-yo'
)
var
yo
=
require
(
'yo-yo'
)
// -------------- styling ----------------------
var
csjs
=
require
(
'csjs-inject'
)
var
csjs
=
require
(
'csjs-inject'
)
var
styleGuide
=
require
(
'./style-guide'
)
var
styles
=
styleGuide
()
module
.
exports
=
loadingSpinner
module
.
exports
=
loadingSpinner
...
@@ -14,7 +17,6 @@ var css = csjs`
...
@@ -14,7 +17,6 @@ var css = csjs`
height: 8px;
height: 8px;
animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
}
}
@keyframes spin {
@keyframes spin {
0% { transform: rotate(0deg); }
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
100% { transform: rotate(360deg); }
...
@@ -26,6 +28,9 @@ function loadingSpinner (cb) {
...
@@ -26,6 +28,9 @@ function loadingSpinner (cb) {
cb
(
function
finish
()
{
cb
(
function
finish
()
{
var
p
=
el
.
parentElement
var
p
=
el
.
parentElement
if
(
p
)
p
.
removeChild
(
el
)
if
(
p
)
p
.
removeChild
(
el
)
var
node
=
document
.
querySelector
(
'[class^=contractTabView]'
)
var
loadingMsg
=
document
.
querySelector
(
'[class^=loadingMsg]'
)
node
.
removeChild
(
loadingMsg
)
})
})
}
}
return
el
return
el
...
...
src/app/style-guide.js
View file @
a86f2385
...
@@ -74,11 +74,11 @@ function styleGuide () {
...
@@ -74,11 +74,11 @@ function styleGuide () {
}
}
.warning-text-box {
.warning-text-box {
background-color :
#E6E5A7
; // yellow
background-color :
hsla(59, 56%, 78%, 0.5)
; // yellow
line-height : 20px;
line-height : 20px;
padding :
1em 1em .5em 1em
;
padding :
8px 15px
;
border-radius :
3
px;
border-radius :
5
px;
bo
x-shadow : rgba(0,0,0,.2) 0 1px 4px;
bo
rder : .2em dotted #ffbd01; // orange-yellow
margin-bottom : 1em;
margin-bottom : 1em;
}
}
...
@@ -143,6 +143,7 @@ function styleGuide () {
...
@@ -143,6 +143,7 @@ function styleGuide () {
return
{
return
{
textBoxL
:
textBoxes
[
'display-box-L'
],
textBoxL
:
textBoxes
[
'display-box-L'
],
infoTextBox
:
textBoxes
[
'info-text-box'
],
infoTextBox
:
textBoxes
[
'info-text-box'
],
warningTextBox
:
textBoxes
[
'warning-text-box'
],
titleL
:
texts
[
'title-L'
],
titleL
:
texts
[
'title-L'
],
titleM
:
texts
[
'title-M'
],
titleM
:
texts
[
'title-M'
],
dropdown
:
buttons
[
'dropdown-menu'
],
dropdown
:
buttons
[
'dropdown-menu'
],
...
...
src/app/tabbed-menu.js
View file @
a86f2385
var
$
=
require
(
'jquery'
)
var
$
=
require
(
'jquery'
)
var
yo
=
require
(
'yo-yo'
)
var
csjs
=
require
(
'csjs-inject'
)
var
styleGuide
=
require
(
'./style-guide'
)
var
styles
=
styleGuide
()
module
.
exports
=
tabbedMenu
module
.
exports
=
tabbedMenu
function
tabbedMenu
(
compiler
,
loadingSpinner
,
self
)
{
function
tabbedMenu
(
compiler
,
loadingSpinner
,
self
)
{
var
css
=
csjs
`
.loadingMsg extends
${
styles
.
warningTextBox
}
{
display: block;
}
`
$
(
'#options li'
).
click
(
function
(
ev
)
{
$
(
'#options li'
).
click
(
function
(
ev
)
{
var
$el
=
$
(
this
)
var
$el
=
$
(
this
)
selectTab
(
$el
)
selectTab
(
$el
)
...
@@ -18,7 +29,9 @@ function tabbedMenu (compiler, loadingSpinner, self) {
...
@@ -18,7 +29,9 @@ function tabbedMenu (compiler, loadingSpinner, self) {
compiler
.
event
.
register
(
'loadingCompiler'
,
function
compilationStarted
()
{
compiler
.
event
.
register
(
'loadingCompiler'
,
function
compilationStarted
()
{
var
contractTab
=
document
.
querySelector
(
'.envView'
)
var
contractTab
=
document
.
querySelector
(
'.envView'
)
if
(
!
contractTab
.
children
.
length
)
{
if
(
!
contractTab
.
children
.
length
)
{
contractTab
.
appendChild
(
loadingSpinner
(
cb
))
var
el
=
document
.
querySelector
(
'[class^=contractTabView]'
)
var
loadingMsg
=
yo
`<div class=
${
css
.
loadingMsg
}
>Solidity compiler is currently loading. Please wait a moment...</div>`
el
.
appendChild
(
loadingMsg
)
}
}
var
settingsTab
=
document
.
querySelector
(
'.settingsView'
)
var
settingsTab
=
document
.
querySelector
(
'.settingsView'
)
if
(
!
settingsTab
.
children
.
length
)
{
if
(
!
settingsTab
.
children
.
length
)
{
...
...
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