From 6a1501e7ae60ddfa83a0c71f3f276076800d59f2 Mon Sep 17 00:00:00 2001 From: Robin Scholtes Date: Mon, 24 Apr 2023 16:13:02 +1200 Subject: [PATCH] [#181] fix glitchy modal popover ( popovers get reinitialised after drag events. This still happens on mobile ops-list ) --- src/web/App.mjs | 5 +++-- src/web/TODO.md | 1 - src/web/waiters/OperationsWaiter.mjs | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/web/App.mjs b/src/web/App.mjs index ed5f9962..954b862a 100755 --- a/src/web/App.mjs +++ b/src/web/App.mjs @@ -882,12 +882,12 @@ class App { /** * Aggregate all the desktop UI functions. * - * Popovers and desktop layout are set on init, but we also need to - * update the UI correctly on window resizing events + * Fires on window resize event ( on min-width breakpoint ) */ setDesktopUI(minimise){ this.setDesktopLayout(minimise); this.manager.ops.enableOpsListPopovers(); + // enable drag and drop } @@ -900,6 +900,7 @@ class App { setMobileUI(){ this.setMobileLayout(); this.manager.ops.disableOpsListPopovers(); + // disable drag and drop / long press and drag and drop for favourites } } diff --git a/src/web/TODO.md b/src/web/TODO.md index 37733101..3843c5a5 100644 --- a/src/web/TODO.md +++ b/src/web/TODO.md @@ -15,7 +15,6 @@ - test drag and drop etc. Regular mobile events / UX - view-heights not correct due to variable taskbar on mobile devices -- minor issue w popovers glitching in modal ( edit favourites ), but it only occurs on (laptop) browser < breakpoint, not on a real mobile device. It's minor but bothers me ### Desktop UI: ### General UI: diff --git a/src/web/waiters/OperationsWaiter.mjs b/src/web/waiters/OperationsWaiter.mjs index 5758bffa..d820bf59 100755 --- a/src/web/waiters/OperationsWaiter.mjs +++ b/src/web/waiters/OperationsWaiter.mjs @@ -298,7 +298,9 @@ class OperationsWaiter { this.removeIntent = false; }.bind(this)); - $("#edit-favourites-list [data-toggle=popover]").popover(); + if (window.innerWidth >= this.app.breakpoint) { + $("#edit-favourites-list [data-toggle=popover]").popover(); + } $("#favourites-modal").modal(); }