beremiz

SVGHMI: Fix browser side exception when some widget are not used, and are then discarded and not present in final SVG. In that case JS code was still making reference to discarded widget elements and was raising exception at init.
svghmi
2021-01-26, Edouard Tisserant
17a9c7a334f7
Parents e704b0487515
Children 7ecaefe38f6f8094494113b6
SVGHMI: Fix browser side exception when some widget are not used, and are then discarded and not present in final SVG. In that case JS code was still making reference to discarded widget elements and was raising exception at init.
1 files changed, 1 insertions(+), 1 deletions(-)
  • +1 -1
    svghmi/widgets_common.ysl2
    • --- a/svghmi/widgets_common.ysl2 Tue Jan 26 11:14:22 2021 +0100
    +++ b/svghmi/widgets_common.ysl2 Tue Jan 26 11:17:08 2021 +0100
    @@ -289,7 +289,7 @@
    ||
    const "excluded_types", "str:split('Page Lang VarInit')";
    -const "included_ids","$parsed_widgets/widget[not(@type = $excluded_types)]/@id";
    +const "included_ids","$parsed_widgets/widget[not(@type = $excluded_types) and not(@id = $discardable_elements/@id)]/@id";
    emit "declarations:hmi-elements" {
    | var hmi_widgets = {