From e8e5eb9c53993521e886b56ad31bfeac7eda3f87 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Tue, 1 Aug 2017 19:23:30 +0000
Subject: [PATCH] Fixed some edge cases for popover triggering

---
 src/web/HTMLOperation.js    |  4 ++--
 src/web/OperationsWaiter.js | 23 ++++++++++++++++++-----
 src/web/RecipeWaiter.js     |  5 ++---
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/web/HTMLOperation.js b/src/web/HTMLOperation.js
index aae9f282..ea0d4397 100755
--- a/src/web/HTMLOperation.js
+++ b/src/web/HTMLOperation.js
@@ -50,8 +50,8 @@ HTMLOperation.prototype.toStubHtml = function(removeIcon) {
     let html = "<li class='operation'";
 
     if (this.description) {
-        html += " data-container='body' data-placement='auto right'\
-            data-content=\"" + this.description + "\"";
+        html += " data-container='body' data-toggle='popover' data-placement='auto right'\
+            data-content=\"" + this.description + "\" data-html='true' data-trigger='hover'";
     }
 
     html += ">" + this.name;
diff --git a/src/web/OperationsWaiter.js b/src/web/OperationsWaiter.js
index 78319a0e..168cff9e 100755
--- a/src/web/OperationsWaiter.js
+++ b/src/web/OperationsWaiter.js
@@ -155,9 +155,20 @@ OperationsWaiter.prototype.getSelectedOp = function(ops) {
  */
 OperationsWaiter.prototype.opListCreate = function(e) {
     this.manager.recipe.createSortableSeedList(e.target);
-    // Allows popover to gain focus for eg. pressing buttons/scrolling
-    $(".operation").popover({trigger: "manual", html: true, animation: true})
-        .on("mouseenter", function () {
+    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 () {
@@ -165,8 +176,10 @@ OperationsWaiter.prototype.opListCreate = function(e) {
             });
         }).on("mouseleave", function () {
             const _this = this;
-            setTimeout(function () {
-                if (!$(".popover:hover").length) {
+            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);
diff --git a/src/web/RecipeWaiter.js b/src/web/RecipeWaiter.js
index 63233127..ea09d325 100755
--- a/src/web/RecipeWaiter.js
+++ b/src/web/RecipeWaiter.js
@@ -93,7 +93,7 @@ RecipeWaiter.prototype.createSortableSeedList = function(listEl) {
             // 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
             // 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.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
     // gets destroyed and recreated.
-    $(evt.clone).popover();
-    $(evt.clone).children("[data-toggle=popover]").popover();
+    this.manager.ops.enableOpsListPopovers(evt.clone);
 
     if (evt.item.parentNode.id !== "rec-list") {
         return;