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
1b88139f
Commit
1b88139f
authored
Dec 05, 2017
by
serapath
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ADD network indicator
parent
79021679
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
1 deletion
+49
-1
run-tab.js
src/app/tabs/run-tab.js
+30
-1
detect-network.js
src/lib/detect-network.js
+19
-0
No files found.
src/app/tabs/run-tab.js
View file @
1b88139f
'use strict'
var
$
=
require
(
'jquery'
)
var
yo
=
require
(
'yo-yo'
)
var
detectNetwork
=
require
(
'../../lib/detect-network'
)
var
helper
=
require
(
'../../lib/helper.js'
)
var
txExecution
=
require
(
'../execution/txExecution'
)
var
txFormat
=
require
(
'../execution/txFormat'
)
...
...
@@ -165,6 +166,20 @@ var css = csjs`
padding-left: 10px;
display: inline;
}
.network {
display: flex;
justify-content: flex-end;
align-items: center;
position: absolute;
color: grey;
width: 100%;
height: 100%;
padding-right: 20px;
pointer-events: none;
}
.networkItem {
margin-right: 5px;
}
`
module
.
exports
=
runTab
...
...
@@ -366,13 +381,26 @@ function contractDropdown (appAPI, appEvents, instanceContainer) {
------------------------------------------------ */
function
settings
(
appAPI
,
appEvents
)
{
// SETTINGS HTML
var
net
=
yo
`<span class=
${
css
.
network
}
></span>`
const
updateNetwork
=
()
=>
{
detectNetwork
((
err
,
{
id
,
name
}
=
{})
=>
{
if
(
err
)
console
.
error
(
err
)
console
.
log
(
`update network[
${
id
}
] name:
${
name
}
`
)
net
.
innerHTML
=
`
<i class="
${
css
.
networkItem
}
fa fa-plug" aria-hidden="true"></i>
${
name
}
(
${
id
||
'-'
}
)
`
})
}
updateNetwork
()
var
el
=
yo
`
<div class="
${
css
.
settings
}
">
<div class="
${
css
.
crow
}
">
<div id="selectExEnv" class="
${
css
.
col1_1
}
">
Environment
</div>
<select id="selectExEnvOptions" class="
${
css
.
select
}
">
<div style="position: relative;">
${
net
}
<select id="selectExEnvOptions" onchange=
${
updateNetwork
}
class="
${
css
.
select
}
">
<option id="vm-mode"
title="Execution environment does not connect to any node, everything is local and in memory only."
value="vm"
...
...
@@ -394,6 +422,7 @@ function settings (appAPI, appEvents) {
</option>
</select>
</div>
</div>
<div class="
${
css
.
crow
}
">
<div class="
${
css
.
col1_1
}
">Account</div>
<select name="txorigin" class="
${
css
.
select
}
" id="txorigin"></select>
...
...
src/lib/detect-network.js
0 → 100644
View file @
1b88139f
var
executionContext
=
require
(
'../execution-context'
)
window
.
executionContext
=
executionContext
module
.
exports
=
detectNetwork
function
detectNetwork
(
callback
)
{
var
web3provider
=
executionContext
.
web3
()
var
get
=
web3provider
.
version
?
web3provider
.
version
.
getNetwork
:
web3provider
.
web3
.
version
.
getNetwork
get
((
err
,
id
)
=>
{
var
name
=
null
if
(
err
)
name
=
'Unknown'
else
if
(
id
===
'1'
)
name
=
'Main'
else
if
(
id
===
'2'
)
name
=
'Morden (deprecated)'
else
if
(
id
===
'3'
)
name
=
'Ropsten'
else
if
(
id
===
'4'
)
name
=
'Rinkeby'
else
if
(
id
===
'42'
)
name
=
'Kovan'
else
name
=
'Unknown'
callback
(
err
,
{
id
,
name
})
})
}
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