Skip to content

Commit 1a662ad

Browse files
committed
refactor
1 parent 1f37607 commit 1a662ad

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

services/static-webserver/client/source/class/osparc/jobs/RunsTable.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,9 @@ qx.Class.define("osparc.jobs.RunsTable", {
166166
this.addListener("cellTap", e => {
167167
const rowIdx = e.getRow();
168168
const target = e.getOriginalTarget();
169-
if (target.closest(".qx-material-button") && (target.tagName === "IMG" || target.tagName === "DIV")) {
170-
const action = target.closest(".qx-material-button").getAttribute("data-action");
169+
const closestItems = osparc.ui.table.cellrenderer.ButtonRenderer.getClosestItems(target);
170+
if (closestItems && (target.tagName === "IMG" || target.tagName === "DIV")) {
171+
const action = closestItems.getAttribute("data-action");
171172
if (action) {
172173
this.__handleButtonClick(action, rowIdx);
173174
}

services/static-webserver/client/source/class/osparc/jobs/SubRunsTable.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ qx.Class.define("osparc.jobs.SubRunsTable", {
136136
this.addListener("cellTap", e => {
137137
const row = e.getRow();
138138
const target = e.getOriginalTarget();
139-
if (target.closest(".qx-material-button") && (target.tagName === "IMG" || target.tagName === "DIV")) {
140-
const action = target.closest(".qx-material-button").getAttribute("data-action");
139+
const closestItems = osparc.ui.table.cellrenderer.ButtonRenderer.getClosestItems(target);
140+
if (closestItems && (target.tagName === "IMG" || target.tagName === "DIV")) {
141+
const action = closestItems.getAttribute("data-action");
141142
if (action) {
142143
this.__handleButtonClick(action, row);
143144
}

services/static-webserver/client/source/class/osparc/ui/table/cellrenderer/ButtonRenderer.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ qx.Class.define("osparc.ui.table.cellrenderer.ButtonRenderer", {
3838
}
3939
},
4040

41+
statics: {
42+
BUTTON_CLASS: "qx-material-button",
43+
// BUTTON_CLASS: "form-button",
44+
45+
getClosestItems: function(target, className = "qx-material-button") {
46+
return target.closest("."+className)
47+
}
48+
},
49+
4150
members: {
4251
// Override
4352
_getContentHtml: function(cellInfo) {
@@ -46,7 +55,7 @@ qx.Class.define("osparc.ui.table.cellrenderer.ButtonRenderer", {
4655

4756
// Return the button with the image
4857
return `
49-
<div class="qx-material-button"
58+
<div class="${this.self().BUTTON_CLASS}"
5059
data-action="${clickAction}" data-row="${cellInfo.row}"
5160
style="cursor:pointer; padding:2px 2px; width:26px; height:18px; display:flex; align-items:center; justify-content:center;"
5261
>

0 commit comments

Comments
 (0)