Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
fd3918c6
Commit
fd3918c6
authored
Aug 11, 2023
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: jslint
parent
7cfa0b6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
5 deletions
+22
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.js
...mplateItem/web_page_module/rjs_gadget_slapos_status_js.js
+20
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.xml
...plateItem/web_page_module/rjs_gadget_slapos_status_js.xml
+2
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.js
View file @
fd3918c6
...
...
@@ -129,12 +129,15 @@
function
getStatus
(
gadget
,
result
)
{
var
i
,
status_class
=
'
ui-btn-no-data
'
,
var
status_class
=
'
ui-btn-no-data
'
,
right_class
=
'
ui-btn-no-data
'
,
main_status_div
=
gadget
.
element
.
querySelector
(
"
.main-status
"
),
monitor_url
=
''
,
main_link_configuration_dict
=
{
"
class
"
:
"
ui-btn ui-btn-icon-left ui-icon-desktop
"
},
sub_link_configuration_dict
=
{
"
class
"
:
"
ui-btn ui-btn-icon-left ui-icon-desktop
"
};
if
(
result
&&
result
.
monitor_url
)
{
...
...
@@ -215,6 +218,19 @@
domsugar
(
main_link_configuration_dict
.
href
?
"
a
"
:
"
span
"
,
main_link_configuration_dict
)
]);
<<<<<<<
HEAD
=======
domsugar
(
sub_status_div
.
querySelector
(
'
div
'
),
{
"
class
"
:
"
ui-bar ui-corner-all last-child
"
+
right_class
},
[
domsugar
(
"
a
"
,
sub_link_configuration_dict
)
]);
if
(
right_class
===
'
ui-btn-hide
'
)
{
// expand main button to use the space
main_status_div
.
className
=
"
ui-block-a ui-block main-status
"
;
}
>>>>>>>
c588db144
(
slapos_jio
:
jslint
)
return
gadget
;
}
...
...
@@ -229,7 +245,8 @@
.
onLoop
(
function
()
{
console
.
log
(
'
status onloop
'
);
var
gadget
=
this
;
if
(
typeof
gadget
.
state
.
jio_key
===
'
string
'
&&
gadget
.
state
.
jio_key
!==
''
)
{
if
(
typeof
gadget
.
state
.
jio_key
===
'
string
'
&&
gadget
.
state
.
jio_key
!==
''
)
{
return
gadget
.
jio_get
(
gadget
.
state
.
jio_key
)
.
push
(
function
(
result
)
{
console
.
log
(
'
status after get
'
,
result
);
...
...
@@ -267,7 +284,7 @@
if
(
!
(
options
.
hasOwnProperty
(
'
jio_key
'
)
&&
options
.
hasOwnProperty
(
'
result
'
)))
{
throw
new
Error
(
'
status gadget did not receive jio_key, portal_type and result values
'
'
status gadget did not receive jio_key, portal_type and result values
'
);
}
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.xml
View file @
fd3918c6
...
...
@@ -278,7 +278,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
1010.24
668.23554.60979
</string>
</value>
<value>
<string>
1010.24
757.4921.60774
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -298,7 +298,7 @@
</tuple>
<state>
<tuple>
<float>
169174
5492.55
</float>
<float>
169174
7841.61
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
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