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
40acc5a6
Commit
40acc5a6
authored
Jul 02, 2020
by
LianaHus
Committed by
Liana Husikyan
Jul 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing word breaking
parent
01e4f4b9
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
24 deletions
+32
-24
file-panel.js
src/app/panels/file-panel.js
+1
-1
Slider.js
src/app/tabs/debugger/debuggerUI/Slider.js
+1
-1
VmDebugger.js
src/app/tabs/debugger/debuggerUI/VmDebugger.js
+6
-8
CodeListView.js
src/app/tabs/debugger/debuggerUI/vmDebugger/CodeListView.js
+5
-5
DropdownPanel.js
src/app/tabs/debugger/debuggerUI/vmDebugger/DropdownPanel.js
+1
-1
SolidityTypeFormatter.js
...gger/debuggerUI/vmDebugger/utils/SolidityTypeFormatter.js
+1
-1
TreeView.js
src/app/ui/TreeView.js
+17
-7
No files found.
src/app/panels/file-panel.js
View file @
40acc5a6
...
@@ -64,7 +64,7 @@ module.exports = class Filepanel extends ViewPlugin {
...
@@ -64,7 +64,7 @@ module.exports = class Filepanel extends ViewPlugin {
const
explorers
=
yo
`
const
explorers
=
yo
`
<div>
<div>
<div class=
${
css
.
treeview
}
data-id="filePanelFileExplorerTree">
${
fileExplorer
.
init
()}
</div>
<div class=
"pl-2
${
css
.
treeview
}
"
data-id="filePanelFileExplorerTree">
${
fileExplorer
.
init
()}
</div>
<div class="filesystemexplorer
${
css
.
treeview
}
">
${
fileSystemExplorer
.
init
()}
</div>
<div class="filesystemexplorer
${
css
.
treeview
}
">
${
fileSystemExplorer
.
init
()}
</div>
</div>
</div>
`
`
...
...
src/app/tabs/debugger/debuggerUI/Slider.js
View file @
40acc5a6
...
@@ -43,7 +43,7 @@ class Slider {
...
@@ -43,7 +43,7 @@ class Slider {
render
()
{
render
()
{
var
self
=
this
var
self
=
this
var
view
=
yo
`<div>
var
view
=
yo
`<div>
<input id='slider' data-id="slider" class='w-100 my-
2
' type='range' min=0 max=
${
this
.
max
}
value=0
<input id='slider' data-id="slider" class='w-100 my-
0
' type='range' min=0 max=
${
this
.
max
}
value=0
onchange=
${
function
()
{
self
.
onChange
()
}
} oninput=
${
function
()
{
self
.
onChange
()
}
} disabled=
${
this
.
disabled
}
/>
onchange=
${
function
()
{
self
.
onChange
()
}
} oninput=
${
function
()
{
self
.
onChange
()
}
} disabled=
${
this
.
disabled
}
/>
</div>`
</div>`
if
(
!
this
.
view
)
{
if
(
!
this
.
view
)
{
...
...
src/app/tabs/debugger/debuggerUI/VmDebugger.js
View file @
40acc5a6
'use strict'
'use strict'
var
csjs
=
require
(
'csjs-inject'
)
var
yo
=
require
(
'yo-yo'
)
var
yo
=
require
(
'yo-yo'
)
var
CodeListView
=
require
(
'./vmDebugger/CodeListView'
)
var
CodeListView
=
require
(
'./vmDebugger/CodeListView'
)
...
@@ -126,19 +125,18 @@ function VmDebugger (vmDebuggerLogic) {
...
@@ -126,19 +125,18 @@ function VmDebugger (vmDebuggerLogic) {
VmDebugger
.
prototype
.
renderHead
=
function
()
{
VmDebugger
.
prototype
.
renderHead
=
function
()
{
this
.
solidityPanel
=
yo
`
this
.
solidityPanel
=
yo
`
<div class="
column
w-100" hidden>
<div class="w-100" hidden>
${
this
.
functionPanel
.
render
()}
${
this
.
functionPanel
.
render
()}
${
this
.
solidityLocals
.
render
()}
${
this
.
solidityLocals
.
render
()}
${
this
.
solidityState
.
render
()}
${
this
.
solidityState
.
render
()}
</div>
</div>
`
`
// style here is a temprorary solution. Ui should be refactored
const
headView
=
yo
`
const
headView
=
yo
`
<div id="vmheadView" class="mt-1 p
r-1" style="padding-left: 7px;
">
<div id="vmheadView" class="mt-1 p
x-0
">
<div class="
row px-1
">
<div class="
d-flex flex-column
">
${
this
.
solidityPanel
}
${
this
.
solidityPanel
}
<div class="
column
w-100">
${
this
.
asmCode
.
render
()}
</div>
<div class="w-100">
${
this
.
asmCode
.
render
()}
</div>
<div class="
column
w-100">
${
this
.
stepDetail
.
render
()}
</div>
<div class="w-100">
${
this
.
stepDetail
.
render
()}
</div>
</div>
</div>
</div>
</div>
`
`
...
@@ -155,7 +153,7 @@ VmDebugger.prototype.remove = function () {
...
@@ -155,7 +153,7 @@ VmDebugger.prototype.remove = function () {
VmDebugger
.
prototype
.
render
=
function
()
{
VmDebugger
.
prototype
.
render
=
function
()
{
const
view
=
yo
`
const
view
=
yo
`
<div id="vmdebugger" class="p
l-1
">
<div id="vmdebugger" class="p
x-2
">
<div>
<div>
${
this
.
stackPanel
.
render
()}
${
this
.
stackPanel
.
render
()}
${
this
.
memoryPanel
.
render
()}
${
this
.
memoryPanel
.
render
()}
...
...
src/app/tabs/debugger/debuggerUI/vmDebugger/CodeListView.js
View file @
40acc5a6
...
@@ -41,11 +41,11 @@ CodeListView.prototype.indexChanged = function (index) {
...
@@ -41,11 +41,11 @@ CodeListView.prototype.indexChanged = function (index) {
}
}
let
codeView
=
this
.
view
.
querySelector
(
'#asmitems'
)
let
codeView
=
this
.
view
.
querySelector
(
'#asmitems'
)
this
.
itemSelected
=
codeView
.
children
[
index
]
this
.
itemSelected
=
codeView
.
children
[
index
]
this
.
itemSelected
.
style
.
setProperty
(
'b
ackground-color'
,
'var(--info
)'
)
this
.
itemSelected
.
style
.
setProperty
(
'b
order-color'
,
'var(--primary
)'
)
this
.
itemSelected
.
style
.
setProperty
(
'
color'
,
'var(--light)
'
)
this
.
itemSelected
.
style
.
setProperty
(
'
border-style'
,
'solid
'
)
this
.
itemSelected
.
setAttribute
(
'selected'
,
'selected'
)
this
.
itemSelected
.
setAttribute
(
'selected'
,
'selected'
)
if
(
this
.
itemSelected
.
firstChild
)
{
if
(
this
.
itemSelected
.
firstChild
)
{
this
.
itemSelected
.
firstChild
.
setAttribute
(
'style'
,
'margin-left: 2px'
)
//
this.itemSelected.firstChild.setAttribute('style', 'margin-left: 2px')
}
}
codeView
.
scrollTop
=
this
.
itemSelected
.
offsetTop
-
parseInt
(
codeView
.
offsetTop
)
codeView
.
scrollTop
=
this
.
itemSelected
.
offsetTop
-
parseInt
(
codeView
.
offsetTop
)
}
}
...
@@ -67,9 +67,9 @@ CodeListView.prototype.changed = function (code, address, index) {
...
@@ -67,9 +67,9 @@ CodeListView.prototype.changed = function (code, address, index) {
CodeListView
.
prototype
.
renderAssemblyItems
=
function
()
{
CodeListView
.
prototype
.
renderAssemblyItems
=
function
()
{
if
(
this
.
code
)
{
if
(
this
.
code
)
{
var
codeView
=
this
.
code
.
map
(
function
(
item
,
i
)
{
var
codeView
=
this
.
code
.
map
(
function
(
item
,
i
)
{
return
yo
`<div key=
${
i
}
value=
${
i
}
><span>
${
item
}
</span></div>`
return
yo
`<div
class="px-1"
key=
${
i
}
value=
${
i
}
><span>
${
item
}
</span></div>`
})
})
return
yo
`<div class="pl-
3 my-2
small
${
css
.
instructions
}
" id='asmitems' ref='itemsList'>
return
yo
`<div class="pl-
2 my-1
small
${
css
.
instructions
}
" id='asmitems' ref='itemsList'>
${
codeView
}
${
codeView
}
</div>`
</div>`
}
}
...
...
src/app/tabs/debugger/debuggerUI/vmDebugger/DropdownPanel.js
View file @
40acc5a6
...
@@ -122,7 +122,7 @@ DropdownPanel.prototype.render = function (overridestyle, node) {
...
@@ -122,7 +122,7 @@ DropdownPanel.prototype.render = function (overridestyle, node) {
<div class='message' style='display:none'></div>
<div class='message' style='display:none'></div>
</div>`
</div>`
var
view
=
yo
`
var
view
=
yo
`
<div class="border rounded p
-1 m
-1 bg-light">
<div class="border rounded p
x-1 mt
-1 bg-light">
<style>
<style>
@-moz-keyframes spin {
@-moz-keyframes spin {
to { -moz-transform: rotate(359deg); }
to { -moz-transform: rotate(359deg); }
...
...
src/app/tabs/debugger/debuggerUI/vmDebugger/utils/SolidityTypeFormatter.js
View file @
40acc5a6
...
@@ -12,7 +12,7 @@ function formatSelf (key, data) {
...
@@ -12,7 +12,7 @@ function formatSelf (key, data) {
if
(
data
.
type
===
'string'
)
{
if
(
data
.
type
===
'string'
)
{
data
.
self
=
JSON
.
stringify
(
data
.
self
)
data
.
self
=
JSON
.
stringify
(
data
.
self
)
}
}
return
yo
`<label
style='
${
keyStyle
}
;white-space:pre-wrap;'>
${
' '
+
key
}
:<label
style=
${
style
}
>
${
' '
+
data
.
self
}
</label><label style='font-style:italic'>
${
data
.
isProperty
||
!
data
.
type
?
''
:
' '
+
data
.
type
}
</label></label>`
return
yo
`<label
class="mb-0" style='
${
keyStyle
}
;white-space:pre-wrap;'>
${
' '
+
key
}
:<label class="mb-0"
style=
${
style
}
>
${
' '
+
data
.
self
}
</label><label style='font-style:italic'>
${
data
.
isProperty
||
!
data
.
type
?
''
:
' '
+
data
.
type
}
</label></label>`
}
}
function
extractData
(
item
,
parent
,
key
)
{
function
extractData
(
item
,
parent
,
key
)
{
...
...
src/app/ui/TreeView.js
View file @
40acc5a6
...
@@ -21,12 +21,17 @@ var css = csjs`
...
@@ -21,12 +21,17 @@ var css = csjs`
.caret_tv {
.caret_tv {
width: 10px;
width: 10px;
flex-shrink: 0;
flex-shrink: 0;
padding-right: 5px;
}
}
.label_
tv
{
.label_
item
{
align-items: center
;
word-break: break-all
;
}
}
.label_tv>span {
.label_key {
word-break: break-word;
min-width: 15%;
word-break: break-all;
}
.label_value {
min-width: 30%;
}
}
`
`
...
@@ -74,7 +79,7 @@ class TreeView {
...
@@ -74,7 +79,7 @@ class TreeView {
var
children
=
Object
.
keys
(
json
).
map
((
innerkey
)
=>
{
var
children
=
Object
.
keys
(
json
).
map
((
innerkey
)
=>
{
return
this
.
renderObject
(
json
[
innerkey
],
json
,
innerkey
,
expand
,
innerkey
)
return
this
.
renderObject
(
json
[
innerkey
],
json
,
innerkey
,
expand
,
innerkey
)
})
})
return
yo
`<ul key=
${
key
}
data-id="treeViewUl
${
key
}
" class="
${
css
.
ul_tv
}
px
-2">
${
children
}
</ul>`
return
yo
`<ul key=
${
key
}
data-id="treeViewUl
${
key
}
" class="
${
css
.
ul_tv
}
ml-0 pr
-2">
${
children
}
</ul>`
}
}
formatData
(
key
,
data
,
children
,
expand
,
keyPath
)
{
formatData
(
key
,
data
,
children
,
expand
,
keyPath
)
{
...
@@ -82,7 +87,7 @@ class TreeView {
...
@@ -82,7 +87,7 @@ class TreeView {
var
li
=
yo
`<li key=
${
keyPath
}
data-id="treeViewLi
${
keyPath
}
" class=
${
css
.
li_tv
}
></li>`
var
li
=
yo
`<li key=
${
keyPath
}
data-id="treeViewLi
${
keyPath
}
" class=
${
css
.
li_tv
}
></li>`
var
caret
=
yo
`<div class="fas fa-caret-right caret
${
css
.
caret_tv
}
"></div>`
var
caret
=
yo
`<div class="fas fa-caret-right caret
${
css
.
caret_tv
}
"></div>`
var
label
=
yo
`
var
label
=
yo
`
<div key=
${
keyPath
}
data-id="treeViewDiv
${
keyPath
}
" class=
${
css
.
label_tv
}
>
<div key=
${
keyPath
}
data-id="treeViewDiv
${
keyPath
}
" class=
"d-flex flex-row align-items-center"
>
${
caret
}
${
caret
}
<span>
${
self
.
formatSelf
(
key
,
data
,
li
)}
</span>
<span>
${
self
.
formatSelf
(
key
,
data
,
li
)}
</span>
</div>`
</div>`
...
@@ -163,7 +168,12 @@ class TreeView {
...
@@ -163,7 +168,12 @@ class TreeView {
}
}
formatSelfDefault
(
key
,
data
)
{
formatSelfDefault
(
key
,
data
)
{
return
yo
`<label>
${
key
}
:
${
data
.
self
}
</label>`
return
yo
`
<div class="d-flex flex-row
${
css
.
label_item
}
">
<label class="font-weight-bold pr-1
${
css
.
label_key
}
">
${
key
}
:</label>
<label class="m-0
${
css
.
label_value
}
">
${
data
.
self
}
</label>
</div>
`
}
}
extractDataDefault
(
item
,
parent
,
key
)
{
extractDataDefault
(
item
,
parent
,
key
)
{
...
...
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