mirror of
https://github.com/gchq/CyberChef.git
synced 2024-11-16 17:08:31 +01:00
Merge branch 'artemisbot-bug/text-overflow'
This commit is contained in:
commit
b8fb5493c5
3 changed files with 35 additions and 4 deletions
|
@ -155,7 +155,35 @@ OperationsWaiter.prototype.getSelectedOp = function(ops) {
|
||||||
*/
|
*/
|
||||||
OperationsWaiter.prototype.opListCreate = function(e) {
|
OperationsWaiter.prototype.opListCreate = function(e) {
|
||||||
this.manager.recipe.createSortableSeedList(e.target);
|
this.manager.recipe.createSortableSeedList(e.target);
|
||||||
$("[data-toggle=popover]").popover();
|
this.enableOpsListPopovers(e.target);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets up popovers, allowing the popover itself to gain focus which enables scrolling
|
||||||
|
* and other interactions.
|
||||||
|
*
|
||||||
|
* @param {Element} el - The element to start selecting from
|
||||||
|
*/
|
||||||
|
OperationsWaiter.prototype.enableOpsListPopovers = function(el) {
|
||||||
|
$(el).find("[data-toggle=popover]").addBack("[data-toggle=popover]")
|
||||||
|
.popover({trigger: "manual"})
|
||||||
|
.on("mouseenter", function() {
|
||||||
|
const _this = this;
|
||||||
|
$(this).popover("show");
|
||||||
|
$(".popover").on("mouseleave", function () {
|
||||||
|
$(_this).popover("hide");
|
||||||
|
});
|
||||||
|
}).on("mouseleave", function () {
|
||||||
|
const _this = this;
|
||||||
|
setTimeout(function() {
|
||||||
|
// Determine if the popover associated with this element is being hovered over
|
||||||
|
if ($(_this).data("bs.popover") &&
|
||||||
|
!$(_this).data("bs.popover").$tip.is(":hover")) {
|
||||||
|
$(_this).popover("hide");
|
||||||
|
}
|
||||||
|
}, 50);
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ RecipeWaiter.prototype.createSortableSeedList = function(listEl) {
|
||||||
// Removes popover element and event bindings from the dragged operation but not the
|
// Removes popover element and event bindings from the dragged operation but not the
|
||||||
// event bindings from the one left in the operations list. Without manually removing
|
// event bindings from the one left in the operations list. Without manually removing
|
||||||
// these bindings, we cannot re-initialise the popover on the stub operation.
|
// these bindings, we cannot re-initialise the popover on the stub operation.
|
||||||
$(evt.item).popover("destroy");
|
$(evt.item).popover("destroy").removeData("bs.popover").off("mouseenter").off("mouseleave");
|
||||||
$(evt.clone).off(".popover").removeData("bs.popover");
|
$(evt.clone).off(".popover").removeData("bs.popover");
|
||||||
evt.item.setAttribute("data-toggle", "popover-disabled");
|
evt.item.setAttribute("data-toggle", "popover-disabled");
|
||||||
},
|
},
|
||||||
|
@ -120,8 +120,7 @@ RecipeWaiter.prototype.opSortEnd = function(evt) {
|
||||||
|
|
||||||
// Reinitialise the popover on the original element in the ops list because for some reason it
|
// Reinitialise the popover on the original element in the ops list because for some reason it
|
||||||
// gets destroyed and recreated.
|
// gets destroyed and recreated.
|
||||||
$(evt.clone).popover();
|
this.manager.ops.enableOpsListPopovers(evt.clone);
|
||||||
$(evt.clone).children("[data-toggle=popover]").popover();
|
|
||||||
|
|
||||||
if (evt.item.parentNode.id !== "rec-list") {
|
if (evt.item.parentNode.id !== "rec-list") {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -142,6 +142,10 @@ optgroup {
|
||||||
border-color: var(--popover-border-colour);
|
border-color: var(--popover-border-colour);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.popover-content {
|
||||||
|
max-height: 90vh;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.popover.right>.arrow {
|
.popover.right>.arrow {
|
||||||
border-right-color: var(--popover-border-colour);
|
border-right-color: var(--popover-border-colour);
|
||||||
|
|
Loading…
Reference in a new issue