Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Mar 24, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0a4762
Optional chaining for event-context block
stefan-hoehn Mar 13, 2024
006f526
Merge branch 'main' into blockly_eventcontext_undefined
stefan-hoehn Mar 24, 2024
7c79397
fix review comment on asNumber/asQuantity
stefan-hoehn Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [`parseFloat(event.${contextInfo}?.toString())`, javascriptGenerator.ORDER_ATOMIC]
stefan-hoehn marked this conversation as resolved.
Show resolved Hide resolved
} else if (type === 'asQuantity') {
return [`Quantity(event.${contextInfo}.toString())`, javascriptGenerator.ORDER_ATOMIC]
return [`Quantity(event.${contextInfo}?.toString())`, javascriptGenerator.ORDER_ATOMIC]
stefan-hoehn marked this conversation as resolved.
Show resolved Hide resolved
} else {
return [`event.${contextInfo}.toString()`, javascriptGenerator.ORDER_ATOMIC]
return [`event.${contextInfo}?.toString()`, javascriptGenerator.ORDER_ATOMIC]
}
}
return [`event.${contextInfo}`, javascriptGenerator.ORDER_ATOMIC]
Expand Down