Skip to content

Commit 906f050

Browse files
committed
[skip ci] resetItemSelected
1 parent 669e7a2 commit 906f050

File tree

3 files changed

+31
-17
lines changed

3 files changed

+31
-17
lines changed

services/static-webserver/client/source/class/osparc/file/FileLabelWithActions.js

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,35 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
8989
},
9090

9191
setItemSelected: function(selectedItem) {
92-
const isFile = osparc.file.FilesTree.isFile(selectedItem);
93-
this.getChildControl("download-button").setEnabled(isFile);
94-
this.getChildControl("delete-button").setEnabled(isFile);
95-
const selectedLabel = this.getChildControl("selected-label");
96-
if (isFile) {
97-
this.__selection = selectedItem;
98-
selectedLabel.set({
99-
value: selectedItem.getLabel(),
100-
toolTipText: selectedItem.getFileId()
101-
});
92+
if (selectedItem) {
93+
const isFile = osparc.file.FilesTree.isFile(selectedItem);
94+
this.getChildControl("download-button").setEnabled(isFile);
95+
this.getChildControl("delete-button").setEnabled(isFile);
96+
const selectedLabel = this.getChildControl("selected-label");
97+
if (isFile) {
98+
this.__selection = selectedItem;
99+
selectedLabel.set({
100+
value: selectedItem.getLabel(),
101+
toolTipText: selectedItem.getFileId()
102+
});
103+
} else {
104+
this.__selection = null;
105+
selectedLabel.set({
106+
value: "",
107+
toolTipText: ""
108+
});
109+
}
102110
} else {
103-
this.__selection = null;
104-
selectedLabel.set({
105-
value: "",
106-
toolTipText: ""
107-
});
111+
this.resetItemSelected();
108112
}
109113
},
110114

115+
resetItemSelected: function() {
116+
this.getChildControl("download-button").setEnabled(false);
117+
this.getChildControl("delete-button").setEnabled(false);
118+
this.getChildControl("selected-label").resetValue();
119+
},
120+
111121
getItemSelected: function() {
112122
const selectedItem = this.__selection;
113123
if (selectedItem && osparc.file.FilesTree.isFile(selectedItem)) {

services/static-webserver/client/source/class/osparc/file/FolderContent.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,11 @@ qx.Class.define("osparc.file.FolderContent", {
239239
this.setSelection([this.getSelectables()[this.getMode() === "icons" ? 0 : 1]]);
240240
},
241241

242-
__itemTapped: function(entry) {
242+
__itemTapped: function(entry, buttonSelected) {
243243
if (this.isMultiSelect()) {
244244
this.fireDataEvent("multiSelectionChanged", entry);
245+
} else if (buttonSelected === false) {
246+
this.fireDataEvent("selectionChanged", null);
245247
} else {
246248
this.fireDataEvent("selectionChanged", entry);
247249
}
@@ -256,7 +258,7 @@ qx.Class.define("osparc.file.FolderContent", {
256258

257259
__attachListenersToGridItem: function(btn, entry) {
258260
btn.addListener("tap", () => {
259-
this.__itemTapped(entry);
261+
this.__itemTapped(entry, btn.getValue());
260262
// folders can't be selected
261263
if (osparc.file.FilesTree.isDir(entry)) {
262264
btn.setValue(false);

services/static-webserver/client/source/class/osparc/file/TreeFolderView.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ qx.Class.define("osparc.file.TreeFolderView", {
106106
const selectionData = e.getData();
107107
if (selectionData) {
108108
selectedFileLayout.setItemSelected(selectionData);
109+
} else {
110+
selectedFileLayout.resetItemSelected(selectionData);
109111
}
110112
}, this);
111113

0 commit comments

Comments
 (0)