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
bb060fc8
Unverified
Commit
bb060fc8
authored
May 03, 2019
by
yann300
Committed by
GitHub
May 03, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1899 from ethereum/yann300-patch-23
Fix the context view
parents
f0860b5c
445439cc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
app.js
src/app.js
+1
-1
contextView.js
src/app/editor/contextView.js
+1
-1
contextView-styles.js
src/app/editor/styles/contextView-styles.js
+5
-5
universal-dapp.js
src/universal-dapp.js
+2
-2
No files found.
src/app.js
View file @
bb060fc8
...
@@ -283,7 +283,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
...
@@ -283,7 +283,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
registry
.
put
({
api
:
udapp
,
name
:
'udapp'
})
registry
.
put
({
api
:
udapp
,
name
:
'udapp'
})
udapp
.
event
.
register
(
'transactionBroadcasted'
,
(
txhash
,
networkName
)
=>
{
udapp
.
event
.
register
(
'transactionBroadcasted'
,
(
txhash
,
networkName
)
=>
{
var
txLink
=
executionContext
.
txDetailsLink
(
networkName
,
txhash
)
var
txLink
=
executionContext
.
txDetailsLink
(
networkName
,
txhash
)
if
(
txLink
)
registry
.
get
(
'logCallback'
).
api
.
logCallback
(
yo
`<a href="
${
txLink
}
" target="_blank">
${
txLink
}
</a>`
)
if
(
txLink
)
registry
.
get
(
'logCallback'
).
api
(
yo
`<a href="
${
txLink
}
" target="_blank">
${
txLink
}
</a>`
)
})
})
const
udappUI
=
new
UniversalDAppUI
(
udapp
,
registry
)
const
udappUI
=
new
UniversalDAppUI
(
udapp
,
registry
)
...
...
src/app/editor/contextView.js
View file @
bb060fc8
...
@@ -41,7 +41,7 @@ class ContextView {
...
@@ -41,7 +41,7 @@ class ContextView {
}
}
render
()
{
render
()
{
const
view
=
yo
`<div class="
${
css
.
contextview
}
${
css
.
contextviewcontainer
}
b
g
-secondary border-top-0">
const
view
=
yo
`<div class="
${
css
.
contextview
}
${
css
.
contextviewcontainer
}
b
adge badge
-secondary border-top-0">
<div class=
${
css
.
container
}
>
<div class=
${
css
.
container
}
>
${
this
.
_renderTarget
()}
${
this
.
_renderTarget
()}
</div>
</div>
...
...
src/app/editor/styles/contextView-styles.js
View file @
bb060fc8
...
@@ -2,8 +2,8 @@ var csjs = require('csjs-inject')
...
@@ -2,8 +2,8 @@ var csjs = require('csjs-inject')
var
css
=
csjs
`
var
css
=
csjs
`
.contextview {
.contextview {
opacity :
0.8
;
opacity :
1
;
}
}
.container {
.container {
padding : 1px 15px;
padding : 1px 15px;
}
}
...
@@ -14,7 +14,7 @@ var css = csjs`
...
@@ -14,7 +14,7 @@ var css = csjs`
text-overflow : ellipsis;
text-overflow : ellipsis;
overflow : hidden;
overflow : hidden;
white-space : nowrap;
white-space : nowrap;
font-size : 1
1
px;
font-size : 1
8
px;
}
}
.type {
.type {
font-style : italic;
font-style : italic;
...
@@ -45,9 +45,9 @@ var css = csjs`
...
@@ -45,9 +45,9 @@ var css = csjs`
}
}
.contextviewcontainer{
.contextviewcontainer{
position : absolute;
position : absolute;
top : 3
9
px;
top : 3
5
px;
z-index : 50;
z-index : 50;
left :
350px
;
left :
40%
;
border-radius : 1px;
border-radius : 1px;
border : 2px solid var(--secondary);
border : 2px solid var(--secondary);
}
}
...
...
src/universal-dapp.js
View file @
bb060fc8
...
@@ -68,7 +68,7 @@ module.exports = class UniversalDApp extends UdappApi {
...
@@ -68,7 +68,7 @@ module.exports = class UniversalDApp extends UdappApi {
executionContext
.
detectNetwork
(
cb
)
executionContext
.
detectNetwork
(
cb
)
},
},
personalMode
:
()
=>
{
personalMode
:
()
=>
{
return
this
.
config
.
get
(
'settings/personal-mode'
)
return
this
.
_deps
.
config
.
get
(
'settings/personal-mode'
)
}
}
})
})
this
.
txRunner
.
event
.
register
(
'transactionBroadcasted'
,
(
txhash
)
=>
{
this
.
txRunner
.
event
.
register
(
'transactionBroadcasted'
,
(
txhash
)
=>
{
...
@@ -94,7 +94,7 @@ module.exports = class UniversalDApp extends UdappApi {
...
@@ -94,7 +94,7 @@ module.exports = class UniversalDApp extends UdappApi {
newAccount
(
password
,
passwordPromptCb
,
cb
)
{
newAccount
(
password
,
passwordPromptCb
,
cb
)
{
if
(
!
executionContext
.
isVM
())
{
if
(
!
executionContext
.
isVM
())
{
if
(
!
this
.
config
.
get
(
'settings/personal-mode'
))
{
if
(
!
this
.
_deps
.
config
.
get
(
'settings/personal-mode'
))
{
return
cb
(
'Not running in personal mode'
)
return
cb
(
'Not running in personal mode'
)
}
}
passwordPromptCb
((
passphrase
)
=>
{
passwordPromptCb
((
passphrase
)
=>
{
...
...
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