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
ddfc094a
Commit
ddfc094a
authored
Apr 30, 2019
by
LianaHus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-restyle errors on compiler tab
-check for fatal error as well -remove errors after file switch
parent
e8509680
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
staticAnalysisView.js
src/app/staticanalysis/staticAnalysisView.js
+1
-1
compile-tab.js
src/app/tabs/compile-tab.js
+8
-1
compilerContainer.js
src/app/tabs/compileTab/compilerContainer.js
+1
-0
renderer.js
src/app/ui/renderer.js
+1
-1
renderer-styles.js
src/app/ui/styles/renderer-styles.js
+0
-4
No files found.
src/app/staticanalysis/staticAnalysisView.js
View file @
ddfc094a
...
@@ -120,7 +120,7 @@ staticAnalysisView.prototype.run = function () {
...
@@ -120,7 +120,7 @@ staticAnalysisView.prototype.run = function () {
}
}
warningCount
++
warningCount
++
var
msg
=
yo
`<span>
${
location
}
${
item
.
warning
}
${
item
.
more
?
yo
`<span><br><a href="
${
item
.
more
}
" target="blank">more</a></span>`
:
yo
`<span></span>`
}
</span>`
var
msg
=
yo
`<span>
${
location
}
${
item
.
warning
}
${
item
.
more
?
yo
`<span><br><a href="
${
item
.
more
}
" target="blank">more</a></span>`
:
yo
`<span></span>`
}
</span>`
self
.
_deps
.
renderer
.
error
(
msg
,
warningContainer
,
{
type
:
'staticAnalysisWarning'
,
useSpan
:
true
})
self
.
_deps
.
renderer
.
error
(
msg
,
warningContainer
,
{
type
:
'staticAnalysisWarning
alert alert-warning
'
,
useSpan
:
true
})
})
})
})
})
self
.
event
.
trigger
(
'staticAnaysisWarning'
,
[
warningCount
])
self
.
event
.
trigger
(
'staticAnaysisWarning'
,
[
warningCount
])
...
...
src/app/tabs/compile-tab.js
View file @
ddfc094a
...
@@ -99,14 +99,21 @@ class CompileTab extends CompilerApi {
...
@@ -99,14 +99,21 @@ class CompileTab extends CompilerApi {
this
.
fileManager
.
events
.
on
(
'currentFileChanged'
,
(
name
)
=>
{
this
.
fileManager
.
events
.
on
(
'currentFileChanged'
,
(
name
)
=>
{
this
.
compilerContainer
.
currentFile
=
name
this
.
compilerContainer
.
currentFile
=
name
cleanupErrors
()
onContentChanged
()
onContentChanged
()
})
})
this
.
fileManager
.
events
.
on
(
'noFileSelected'
,
()
=>
{
this
.
fileManager
.
events
.
on
(
'noFileSelected'
,
()
=>
{
this
.
compilerContainer
.
currentFile
=
''
this
.
compilerContainer
.
currentFile
=
''
cleanupErrors
()
onContentChanged
()
onContentChanged
()
})
})
const
cleanupErrors
=
()
=>
{
this
.
_view
.
errorContainer
.
innerHTML
=
''
this
.
events
.
emit
(
'statusChanged'
,
{
key
:
''
,
title
:
''
,
type
:
''
})
}
this
.
compiler
.
event
.
register
(
'compilationFinished'
,
(
success
,
data
,
source
)
=>
{
this
.
compiler
.
event
.
register
(
'compilationFinished'
,
(
success
,
data
,
source
)
=>
{
if
(
success
)
{
if
(
success
)
{
// forwarding the event to the appManager infra
// forwarding the event to the appManager infra
...
@@ -259,7 +266,7 @@ class CompileTab extends CompilerApi {
...
@@ -259,7 +266,7 @@ class CompileTab extends CompilerApi {
var
result
=
yo
`<div>
${
uploaded
.
map
((
value
)
=>
{
var
result
=
yo
`<div>
${
uploaded
.
map
((
value
)
=>
{
return
yo
`<div><b>
${
value
.
filename
}
</b> : <pre>
${
value
.
output
.
url
}
</pre></div>`
return
yo
`<div><b>
${
value
.
filename
}
</b> : <pre>
${
value
.
output
.
url
}
</pre></div>`
})}
</div>`
})}
</div>`
modalDialogCustom
.
alert
(
yo
`<span>Metadata published successfully.<br> <
pre>
${
result
}
</pre
> </span>`
)
modalDialogCustom
.
alert
(
yo
`<span>Metadata published successfully.<br> <
span>
${
result
}
</span
> </span>`
)
}
}
},
(
item
)
=>
{
// triggered each time there's a new verified publish (means hash correspond)
},
(
item
)
=>
{
// triggered each time there's a new verified publish (means hash correspond)
this
.
swarmfileProvider
.
addReadOnly
(
item
.
hash
,
item
.
content
)
this
.
swarmfileProvider
.
addReadOnly
(
item
.
hash
,
item
.
content
)
...
...
src/app/tabs/compileTab/compilerContainer.js
View file @
ddfc094a
...
@@ -40,6 +40,7 @@ class CompilerContainer {
...
@@ -40,6 +40,7 @@ class CompilerContainer {
}
}
activate
()
{
activate
()
{
this
.
currentFile
=
this
.
config
.
get
(
'currentFile'
)
this
.
listenToEvents
()
this
.
listenToEvents
()
}
}
...
...
src/app/ui/renderer.js
View file @
ddfc094a
...
@@ -90,7 +90,7 @@ Renderer.prototype.error = function (message, container, opt) {
...
@@ -90,7 +90,7 @@ Renderer.prototype.error = function (message, container, opt) {
var
$pre
=
$
(
opt
.
useSpan
?
yo
`<span></span>`
:
yo
`<pre></pre>`
).
html
(
message
)
var
$pre
=
$
(
opt
.
useSpan
?
yo
`<span></span>`
:
yo
`<pre></pre>`
).
html
(
message
)
let
classList
=
opt
.
type
===
'error'
?
'alert alert-danger'
:
'alert alert-warning'
let
classList
=
opt
.
type
===
'error'
?
'alert alert-danger'
:
'alert alert-warning'
var
$error
=
$
(
yo
`<div class="
${
classList
}
"><div class="close"><i class="fas fa-times"></i></div></div>`
).
prepend
(
$pre
)
var
$error
=
$
(
yo
`<div class="
sol
${
opt
.
type
}
${
classList
}
"><div class="close"><i class="fas fa-times"></i></div></div>`
).
prepend
(
$pre
)
$
(
container
).
append
(
$error
)
$
(
container
).
append
(
$error
)
$error
.
click
((
ev
)
=>
{
$error
.
click
((
ev
)
=>
{
...
...
src/app/ui/styles/renderer-styles.js
View file @
ddfc094a
...
@@ -40,16 +40,12 @@ var css = yo`<style>
...
@@ -40,16 +40,12 @@ var css = yo`<style>
}
}
.sol.error {
.sol.error {
background-color: var(--danger);
color: var(--white);
}
}
.sol.warning {
.sol.warning {
background-color: var(--warning);
}
}
.sol.staticAnalysisWarning {
.sol.staticAnalysisWarning {
background-color: var(--warning);
}
}
.sol.success {
.sol.success {
...
...
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