From eaca195460e826c38316f2b6dcf47e62d5348d1c Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 13 Aug 2019 19:59:36 +0200
Subject: [PATCH] context menu visualization fixed - it's slightly different in
bootstrap 4
---
CHANGELOG | 1 +
frontend-js/src/main/js/gui/ContextMenu.js | 11 +++++------
frontend-js/src/main/js/gui/SubMenu.js | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 5182e81ee9..e4cc527cca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ minerva (14.0.0~alpha.1) unstable; urgency=low
* Bug fix: upload of invalid plugin doesn't add it to plugin tab and list of
loaded plugins (#885)
* Bug fix: link to molart was brokwn (#886)
+ * Bug fix: context menu visualization fixed
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 12 Aug 2019 10:00:00 +0200
diff --git a/frontend-js/src/main/js/gui/ContextMenu.js b/frontend-js/src/main/js/gui/ContextMenu.js
index d00fcdc656..2589284633 100644
--- a/frontend-js/src/main/js/gui/ContextMenu.js
+++ b/frontend-js/src/main/js/gui/ContextMenu.js
@@ -43,7 +43,7 @@ function ContextMenu(params) {
self._documentClickListener = function (e) {
var className = e.target.className;
if (typeof className === 'string' || className instanceof String) {
- if (className.indexOf("dropdown-link") === -1) {
+ if (className.indexOf("dropdown-item") === -1) {
self.hide(new Date().getTime() - self.MIN_SHOW_TIME);
}
} else {
@@ -83,13 +83,12 @@ ContextMenu.prototype.addOption = function (name, handler, disabled) {
});
var link = Functions.createElement({
type: "a",
- className: "dropdown-link",
+ className: "dropdown-item",
+ href: "#",
content: name
});
- if (!disabled) {
- link.href = "#";
- } else {
- link.className = 'disabled-link';
+ if (disabled) {
+ link.className = 'dropdown-item disabled';
}
$(link).data("handler", handler);
option.appendChild(link);
diff --git a/frontend-js/src/main/js/gui/SubMenu.js b/frontend-js/src/main/js/gui/SubMenu.js
index 1c2838ff29..1663675072 100644
--- a/frontend-js/src/main/js/gui/SubMenu.js
+++ b/frontend-js/src/main/js/gui/SubMenu.js
@@ -30,7 +30,7 @@ SubMenu.prototype._createGui = function (params) {
var link = Functions.createElement({
type: "a",
href: "#",
- className: "dropdown-link",
+ className: "dropdown-item",
content: params.name
});
link.tabIndex = -1;
@@ -55,7 +55,7 @@ SubMenu.prototype.addOption = function (name, handler) {
var link = Functions.createElement({
type: "a",
href: "#",
- className: "dropdown-link",
+ className: "dropdown-item",
content: name
});
$(link).data("handler", handler);
--
GitLab