Skip to content

Commit 7db7e6b

Browse files
Release 2.1.1 (#2)
# Release 2.1.1 ## Bugfix - Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK - UI differs if deployed via Appstudio or VS Code AppSpace SDK - Fullscreen icon of iFrame was visible
1 parent ac82c0d commit 7db7e6b

8 files changed

Lines changed: 37 additions & 17 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## Release 2.1.1
5+
6+
### Bugfix
7+
- Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK
8+
- UI differs if deployed via Appstudio or VS Code AppSpace SDK
9+
- Fullscreen icon of iFrame was visible
10+
411
## Release 2.1.0
512

613
### New features

CSK_Module_DeviceScanner/pages/pages/CSK_Module_DeviceScanner/CSK_Module_DeviceScanner.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@
5252

5353
.myCustomButton_CSK_Module_DeviceScanner {
5454
border-radius: 30px;
55-
padding-right: 0px;
55+
padding: 11px;
5656
}

CSK_Module_DeviceScanner/pages/pages/CSK_Module_DeviceScanner/CSK_Module_DeviceScanner.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
<layout-row id="RowLayout13">
88
<layout-column id="ColumnLayout14" style="align-items: stretch">
99
<layout-row id="RowLayout14" style="align-items: baseline">
10-
<davinci-value-display id="VD_Title" class="myCustomLabel_CSK_Module_DeviceScanner"
11-
value="Device Scanner">
12-
</davinci-value-display>
10+
<h1 id="Heading_Title" class="myCustomLabel_CSK_Module_DeviceScanner">
11+
Device Scanner
12+
</h1>
1313
<davinci-value-display id="VD_Version">
14-
<crown-edpws-binding property="value" name="CSK_DeviceScanner/OnNewStatusModuleVersion"
15-
update-on-resume>
16-
</crown-edpws-binding>
14+
<crown-on property="value" crown-event="CSK_DeviceScanner/OnNewStatusModuleVersion">
15+
</crown-on>
1716
</davinci-value-display>
1817
</layout-row>
1918
</layout-column>
@@ -53,7 +52,7 @@
5352
<stacked-pane id="SP_Error" value="error">
5453
<davinci-callout id="Callout8" type="error">
5554
<span>
56-
New config NOT accepted (maybe just temporarly active)! Trigger rescan to update the list.
55+
New config NOT accepted (maybe just temporarly active)! Check if the device needs to be stopped first. Trigger rescan to update the list.
5756
</span>
5857
</davinci-callout>
5958
</stacked-pane>
@@ -115,7 +114,8 @@
115114
<layout-column id="ColumnLayout12" style="align-items: center">
116115
<davinci-button id="B_Scan"
117116
class="myCustomButton_CSK_Module_DeviceScanner" type="outline"
118-
icon-position="append" title="Scan for Device" icon="action/search">
117+
title="Scan for Device">
118+
<davinci-icon icon="action/search"></davinci-icon>
119119
<span></span>
120120
<crown-binding event="submit"
121121
name="CSK_DeviceScanner/scanForDevices" auto-commit>
@@ -209,8 +209,8 @@
209209
<layout-column id="ColumnLayout13" style="align-items: center">
210210
<davinci-button id="B_SendConfig"
211211
class="myCustomButton_CSK_Module_DeviceScanner" type="outline"
212-
icon-position="append" title="Send new config to device"
213-
icon="navigation/check">
212+
title="Send new config to device">
213+
<davinci-icon icon="navigation/check"></davinci-icon>
214214
<span></span>
215215
<crown-binding event="submit" name="CSK_DeviceScanner/sendNewConfig"
216216
auto-commit>

CSK_Module_DeviceScanner/pages/src/converter.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ export function invertStatusString(value) {
99
export function changeStyle(theme) {
1010
const style: HTMLStyleElement = document.createElement('style');
1111
style.id ='blub'
12+
13+
const toggleSW = document.querySelectorAll("davinci-toggle-switch")
14+
toggleSW.forEach((userItem) => {
15+
const shadowToggle = userItem.shadowRoot
16+
const finalToggleSW = shadowToggle?.querySelector('div')
17+
finalToggleSW?.classList.add('hasIcon')
18+
});
19+
1220
if (theme == 'CSK_Style'){
1321
var headerToolbar = `.sopasjs-ui-header-toolbar-wrapper { background-color: #FFFFFF; }`
1422
var uiHeader = `.sopasjs-ui-header>.app-logo { margin-right:0px; }`

CSK_Module_DeviceScanner/pages/src/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ document.addEventListener('sopasjs-ready', () => {
1212
page_Setup.remove();
1313

1414
setTimeout(() => {
15+
const element = document.querySelector("div.sjs-wrapper > div > div.sjs-fullscreen-toggle")
16+
if(element) {
17+
element.parentElement.removeChild(element)
18+
}
1519
document.title = 'CSK_Module_DeviceScanner'
1620
}, 500);
1721
})

CSK_Module_DeviceScanner/project.mf.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Typically the feature of this module is used like this: +
128128
</serves>
129129
</crown>
130130
<meta key="author">SICK AG</meta>
131-
<meta key="version">2.1.0</meta>
131+
<meta key="version">2.1.1</meta>
132132
<meta key="priority">low</meta>
133133
<meta key="copy-protected">false</meta>
134134
<meta key="read-protected">false</meta>

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ For further information regarding the internal used functions / events check out
1414
Tested on:
1515
|Device|Firmware|Module version|
1616
|--|--|--|
17+
|SICK AppEngine|V1.7.0|V2.1.1|
1718
|SICK AppEngine|V1.7.0|V2.1.0|
1819
|SIM1012|V2.4.2|V2.1.0|
1920
|SICK AppEngine|V1.3.2|<V2.1.0|

docu/CSK_Module_DeviceScanner.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta name="generator" content="Asciidoctor 2.0.12">
88
<meta name="author" content="SICK AG">
9-
<title>Documentation - CSK_Module_DeviceScanner 2.1.0</title>
9+
<title>Documentation - CSK_Module_DeviceScanner 2.1.1</title>
1010
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
1111
<style>
1212
/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -615,10 +615,10 @@
615615
</head>
616616
<body class="article toc2 toc-left">
617617
<div id="header">
618-
<h1>Documentation - CSK_Module_DeviceScanner 2.1.0</h1>
618+
<h1>Documentation - CSK_Module_DeviceScanner 2.1.1</h1>
619619
<div class="details">
620620
<span id="author" class="author">SICK AG</span><br>
621-
<span id="revnumber">version 2.1.0,</span>
621+
<span id="revnumber">version 2.1.1,</span>
622622
<span id="revdate">2024-07-31</span>
623623
</div>
624624
<div id="toc" class="toc2">
@@ -696,7 +696,7 @@ <h2 id="_document_metadata">Document metadata</h2>
696696
</tr>
697697
<tr>
698698
<th class="tableblock halign-left valign-top"><p class="tableblock">Version</p></th>
699-
<td class="tableblock halign-left valign-top"><p class="tableblock">2.1.0</p></td>
699+
<td class="tableblock halign-left valign-top"><p class="tableblock">2.1.1</p></td>
700700
</tr>
701701
<tr>
702702
<th class="tableblock halign-left valign-top"><p class="tableblock">Date</p></th>
@@ -2107,7 +2107,7 @@ <h4 id="_overview_2">Overview</h4>
21072107
</div>
21082108
<div id="footer">
21092109
<div id="footer-text">
2110-
Version 2.1.0<br>
2110+
Version 2.1.1<br>
21112111
Last updated 2024-07-31 16:12:23 +0200
21122112
</div>
21132113
</div>

0 commit comments

Comments
 (0)