Skip to content

Commit 72db3f8

Browse files
committed
marker under control
1 parent 8a221f1 commit 72db3f8

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

services/static-webserver/client/source/class/osparc/data/model/Node.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -685,20 +685,21 @@ qx.Class.define("osparc.data.model.Node", {
685685
},
686686

687687
__applyMarker: function(marker, oldMarker) {
688-
if (marker && oldMarker) {
689-
this.fireDataEvent("updateStudyDocument", {
690-
"op": "replace",
691-
"path": `/ui/workbench/${this.getNodeId()}/marker`,
692-
"value": marker.getColor(),
693-
"osparc-resource": "ui",
694-
});
695-
} else if (marker && oldMarker === null) {
688+
if (marker) {
696689
this.fireDataEvent("updateStudyDocument", {
697690
"op": "add",
698691
"path": `/ui/workbench/${this.getNodeId()}/marker`,
699692
"value": marker.getColor(),
700693
"osparc-resource": "ui",
701694
});
695+
marker.addListener("changeColor", e => {
696+
this.fireDataEvent("updateStudyDocument", {
697+
"op": "replace",
698+
"path": `/ui/workbench/${this.getNodeId()}/marker`,
699+
"value": e.getData(),
700+
"osparc-resource": "ui",
701+
});
702+
});
702703
} else {
703704
this.fireDataEvent("updateStudyDocument", {
704705
"op": "delete",

services/static-webserver/client/source/class/osparc/editor/AnnotationEditor.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ qx.Class.define("osparc.editor.AnnotationEditor", {
166166
const colorPicker = this.getChildControl("color-picker");
167167
marker.bind("color", colorPicker, "value");
168168
colorPicker.bind("value", marker, "color");
169+
170+
this.getChildControl("delete-btn").exclude();
169171
},
170172

171173
addDeleteButton: function() {

0 commit comments

Comments
 (0)