Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

BasicUI: set widget value regardless of whether or not visibility has changed #3958

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 22 additions & 15 deletions extensions/ui/org.eclipse.smarthome.ui.basic/web-src/smarthome.js
Expand Up @@ -1742,22 +1742,29 @@
widget: widget,
visibility: data.visibility
});
} else {
widget.setValue(smarthome.UI.escapeHtml(value), data.item.state);
if (data.label !== undefined) {
widget.setLabel(data.label);
}
if (data.labelcolor !== undefined) {
widget.setLabelColor(data.labelcolor);
} else {
widget.setLabelColor("");
}
if (data.valuecolor !== undefined) {
widget.setValueColor(data.valuecolor);
} else {
widget.setValueColor("");
}
}

widget.setValue(smarthome.UI.escapeHtml(value), data.item.state);

[{
apply: widget.setLabel,
data: data.label,
fallback: null
}, {
apply: widget.setLabelColor,
data: data.labelcolor,
fallback: ""
}, {
apply: widget.setValueColor,
data: data.valuecolor,
fallback: ""
}].forEach(function(e) {
if (e.data !== undefined) {
e.apply(e.data);
} else if (e.fallback !== null) {
e.apply(e.fallback);
}
});
}
});

Expand Down