From 47d5d22775c66bc46cb93144f08de854d3ae94e0 Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Mon, 13 May 2024 05:44:33 +0100
Subject: [PATCH] Create separate function for control icons

---
 www/js/lib/uiUtil.js | 55 ++++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/www/js/lib/uiUtil.js b/www/js/lib/uiUtil.js
index e6396f78..779acbc0 100644
--- a/www/js/lib/uiUtil.js
+++ b/www/js/lib/uiUtil.js
@@ -1688,28 +1688,7 @@ function attachKiwixPopoverDiv (ev, link, articleBaseUrl, dark) {
                 div.appendChild(span);
             }
             // Programme the icons
-            var breakout = function (e) {
-                e.preventDefault();
-                e.stopPropagation();
-                link.newcontainer = true;
-                link.click();
-                closePopover(div);
-            }
-            var closeIcon = currentDocument.getElementById('popcloseicon');
-            var breakoutIcon = currentDocument.getElementById('popbreakouticon');
-            // Register click event for full support
-            closeIcon.addEventListener('mousedown', function () {
-                closePopover(div);
-            }, true);
-            breakoutIcon.addEventListener('mousedown', breakout, true);
-            // Register either pointerdown or touchstart if supported
-            var eventName = window.PointerEvent ? 'pointerdown' : 'touchstart';
-            closeIcon.addEventListener(eventName, function (e) {
-                e.preventDefault();
-                e.stopPropagation();
-                closePopover(div);
-            }, true);
-            breakoutIcon.addEventListener(eventName, breakout, true);
+            addEventListenersToPopoverIcons(link, div, currentDocument);
         }).catch(function (err) {
             console.warn(err);
             // Remove the div
@@ -1721,6 +1700,38 @@ function attachKiwixPopoverDiv (ev, link, articleBaseUrl, dark) {
     }, 500);
 }
 
+/**
+ * Adds event listeners to the popover's control icons
+ *
+ * @param {Element} anchor The anchor which launched the popover
+ * @param {Element} popover The containing element of the popover (div)
+ * @param {Document} doc The doucment on which to operate
+ */
+function addEventListenersToPopoverIcons (anchor, popover, doc) {
+    var breakout = function (e) {
+        e.preventDefault();
+        e.stopPropagation();
+        anchor.newcontainer = true;
+        anchor.click();
+        closePopover(popover);
+    }
+    var closeIcon = doc.getElementById('popcloseicon');
+    var breakoutIcon = doc.getElementById('popbreakouticon');
+    // Register click event for full support
+    closeIcon.addEventListener('mousedown', function () {
+        closePopover(popover);
+    }, true);
+    breakoutIcon.addEventListener('mousedown', breakout, true);
+    // Register either pointerdown or touchstart if supported
+    var eventName = window.PointerEvent ? 'pointerdown' : 'touchstart';
+    closeIcon.addEventListener(eventName, function (e) {
+        e.preventDefault();
+        e.stopPropagation();
+        closePopover(popover);
+    }, true);
+    breakoutIcon.addEventListener(eventName, breakout, true);
+}
+
 /**
  * Remove any preview popover DIVs
  *