From 21465843fc5c4235fd76f83461b219e09e8c7387 Mon Sep 17 00:00:00 2001 From: Aevann Date: Thu, 11 Apr 2024 13:14:17 +0200 Subject: [PATCH] move expanded image code to expanded_image_modal --- files/assets/js/bottom.js | 6 ------ files/assets/js/expanded_image_modal.js | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/files/assets/js/bottom.js b/files/assets/js/bottom.js index 6c30725dd..9ebfe2442 100644 --- a/files/assets/js/bottom.js +++ b/files/assets/js/bottom.js @@ -181,12 +181,6 @@ document.addEventListener("click", function(e) { if (element instanceof HTMLImageElement && (element.alt.startsWith('![](') || element.classList.contains('img'))) { expandImage() - all_images = element.parentElement.parentElement.parentElement.getElementsByClassName('img') - if (all_images.length != 0) { - last_img_index = all_images.length - 1 - position = [].indexOf.call(all_images, element); - handle_navigation(0) - } } else if (element.classList.contains('showmore')) { showmore(element) diff --git a/files/assets/js/expanded_image_modal.js b/files/assets/js/expanded_image_modal.js index 7150cce65..a54035d4b 100644 --- a/files/assets/js/expanded_image_modal.js +++ b/files/assets/js/expanded_image_modal.js @@ -38,6 +38,14 @@ function expandImage(url) { document.getElementById('imgnav-next').classList.add('d-none') document.getElementById('imgnav-prev').classList.add('d-none') + const element = this.event.target + all_images = element.parentElement.parentElement.parentElement.getElementsByClassName('img') + if (all_images.length != 0) { + last_img_index = all_images.length - 1 + position = [].indexOf.call(all_images, element); + handle_navigation(0) + } + const e = this.event if (e.ctrlKey || e.metaKey || e.shiftKey || e.altKey) return;