Skip to content

Commit a9b5bfc

Browse files
committed
highlilight compatible icons
1 parent d9260ed commit a9b5bfc

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

services/static-webserver/client/source/class/osparc/dashboard/DragDropHelpers.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,18 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
7777

7878
const dragWidget = osparc.dashboard.DragWidget.getInstance();
7979
dragWidget.setDropAllowed(compatible);
80+
81+
folderItem.getChildControl("icon").setTextColor(compatible ? "strong-main" : "text");
8082
},
8183

82-
drop: function(event, destWorkspaceId, destFolderId) {
84+
drop: function(event, folderItem, destWorkspaceId, destFolderId) {
8385
const studyData = event.getData("osparc-moveStudy")["studyDataOrigin"];
8486
const studyToFolderData = {
8587
studyData,
8688
destWorkspaceId,
8789
destFolderId,
8890
};
91+
folderItem.getChildControl("icon").resetTextColor();
8992
return studyToFolderData;
9093
},
9194
},
@@ -150,23 +153,27 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
150153

151154
const dragWidget = osparc.dashboard.DragWidget.getInstance();
152155
dragWidget.setDropAllowed(compatible);
156+
157+
folderItem.getChildControl("icon").setTextColor(compatible ? "strong-main" : "text");
153158
},
154159

155-
drop: function(event, destWorkspaceId, destFolderId) {
160+
drop: function(event, folderItem, destWorkspaceId, destFolderId) {
156161
const folderOrigin = event.getData("osparc-moveFolder")["folderOrigin"];
157162
const folderToFolderData = {
158163
folderId: folderOrigin.getFolderId(),
159164
destWorkspaceId,
160165
destFolderId,
161166
};
167+
folderItem.getChildControl("icon").resetTextColor();
162168
return folderToFolderData;
163169
},
164170
},
165171

166172
dragLeave: function(item) {
167-
item.getChildControl("icon").resetTextColor();
168173
const dragWidget = osparc.dashboard.DragWidget.getInstance();
169174
dragWidget.setDropAllowed(false);
175+
176+
item.getChildControl("icon").resetTextColor();
170177
},
171178

172179
dragEnd: function(draggedItem) {

services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
195195
this.addListener("drop", e => {
196196
const folderDest = this.getFolder();
197197
if (e.supportsType("osparc-moveStudy")) {
198-
const studyToFolderData = osparc.dashboard.DragDropHelpers.moveStudy.drop(e, folderDest.getWorkspaceId(), folderDest.getFolderId());
198+
const studyToFolderData = osparc.dashboard.DragDropHelpers.moveStudy.drop(e, this, folderDest.getWorkspaceId(), folderDest.getFolderId());
199199
this.fireDataEvent("studyToFolderRequested", studyToFolderData);
200200
} else if (e.supportsType("osparc-moveFolder")) {
201-
const folderToFolderData = osparc.dashboard.DragDropHelpers.moveFolder.drop(e, folderDest.getWorkspaceId(), folderDest.getFolderId());
201+
const folderToFolderData = osparc.dashboard.DragDropHelpers.moveFolder.drop(e, this, folderDest.getWorkspaceId(), folderDest.getFolderId());
202202
this.fireDataEvent("folderToFolderRequested", folderToFolderData);
203203
}
204204
});

services/static-webserver/client/source/class/osparc/dashboard/WorkspacesAndFoldersTreeItem.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTreeItem", {
119119
const workspaceDestId = this.getModel().getWorkspaceId();
120120
const folderDestId = this.getModel().getFolderId();
121121
if (e.supportsType("osparc-moveStudy")) {
122-
const studyToFolderData = osparc.dashboard.DragDropHelpers.moveStudy.drop(e, workspaceDestId, folderDestId);
122+
const studyToFolderData = osparc.dashboard.DragDropHelpers.moveStudy.drop(e, this, workspaceDestId, folderDestId);
123123
this.fireDataEvent("studyToFolderRequested", studyToFolderData);
124124
} else if (e.supportsType("osparc-moveFolder")) {
125-
const folderToFolderData = osparc.dashboard.DragDropHelpers.moveFolder.drop(e, workspaceDestId, folderDestId);
125+
const folderToFolderData = osparc.dashboard.DragDropHelpers.moveFolder.drop(e, this, workspaceDestId, folderDestId);
126126
this.fireDataEvent("folderToFolderRequested", folderToFolderData);
127127
}
128128
draggingOver = false;

0 commit comments

Comments
 (0)