OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[blockly] Fix missing event property causes JS error (#2476) 

See https://community.openhab.org/t/blockly-proposal-to-change-contextual-info-blocks/154403/27.

Signed-off-by: Stefan Höhn <mail@stefanhoehn.com>
pull/2497/head
stefan-hoehn 2024-03-24 21:26:48 +01:00 committed by GitHub
parent a81bb0dd3a
commit 32b8b88e47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-scripts.js
View File

@ -283,11 +283,11 @@ export default function defineOHBlocks_Scripts (f7, isGraalJs, scripts) {
if (contextInfo === 'ruleUID') return ['ctx.ruleUID', javascriptGenerator.ORDER_ATOMIC]
if (contextInfo === 'itemState' || contextInfo === 'oldItemState' || contextInfo === 'itemCommand') {
if (type === 'asNumber') {
return [`parseFloat(event.${contextInfo}.toString())`, javascriptGenerator.ORDER_ATOMIC]
return [`event.${contextInfo} !== undefined ? parseFloat(event.${contextInfo}.toString()) : undefined`, javascriptGenerator.ORDER_ATOMIC]
} else if (type === 'asQuantity') {
return [`Quantity(event.${contextInfo}.toString())`, javascriptGenerator.ORDER_ATOMIC]
return [`event.${contextInfo} !== undefined ? Quantity(event.${contextInfo}.toString() : undefined)`, javascriptGenerator.ORDER_ATOMIC]
} else {
return [`event.${contextInfo}.toString()`, javascriptGenerator.ORDER_ATOMIC]
return [`event.${contextInfo}?.toString()`, javascriptGenerator.ORDER_ATOMIC]
}
}
return [`event.${contextInfo}`, javascriptGenerator.ORDER_ATOMIC]