From 23a10fdc227954128ccf1da74ad723b92dcab752 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:32:30 +0000
Subject: [PATCH 1/5] Optimize past swipe counters performance

---
 public/index.html            |  2 +-
 public/script.js             | 11 +++++------
 public/scripts/power-user.js |  4 ++--
 public/style.css             | 10 ++++++++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/public/index.html b/public/index.html
index d8296c1fb..32723dd05 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4183,7 +4183,7 @@
                                 </label>
                                 <label for="show_swipe_num_all_messages" class="checkbox_label" title="Display swipe numbers for all messages, not just the last." data-i18n="[title]Display swipe numbers for all messages, not just the last.">
                                     <input id="show_swipe_num_all_messages" type="checkbox" />
-                                    <small data-i18n="Swipe # for All Messages">Swipe # for All Messages</small><i class="fa-solid fa-mobile-screen-button"></i>
+                                    <small data-i18n="Swipe # for All Messages">Swipe # for All Messages</small>
                                 </label>
                                 <label for="hotswapEnabled" class="checkbox_label" title="In the Character Management panel, show quick selection buttons for favorited characters." data-i18n="[title]In the Character Management panel, show quick selection buttons for favorited characters">
                                     <input id="hotswapEnabled" type="checkbox" />
diff --git a/public/script.js b/public/script.js
index f803ac4f8..c7744984e 100644
--- a/public/script.js
+++ b/public/script.js
@@ -98,7 +98,6 @@ import {
     resetMovableStyles,
     forceCharacterEditorTokenize,
     applyPowerUserSettings,
-    switchSwipeNumAllMessages,
 } from './scripts/power-user.js';
 
 import {
@@ -7660,14 +7659,12 @@ export function showSwipeButtons() {
     //allows for writing individual swipe counters for past messages
     const lastSwipeCounter = $('.last_mes .swipes-counter');
     lastSwipeCounter.text(swipeCounterText).show();
-
-    switchSwipeNumAllMessages();
 }
 
 export function hideSwipeButtons() {
-    $('#chat').find('.swipe_right').hide();
-    $('#chat').find('.last_mes .swipes-counter').hide();
-    $('#chat').find('.swipe_left').hide();
+    chatElement.find('.swipe_right').hide();
+    chatElement.find('.last_mes .swipes-counter').hide();
+    chatElement.find('.swipe_left').hide();
 }
 
 /**
@@ -8538,6 +8535,8 @@ const swipe_right = () => {
     }
     if (run_generate) {               //hide swipe arrows while generating
         this_div.css('display', 'none');
+        const swipesCounter = currentMessage.find('.swipes-counter');
+        swipesCounter.hide();
     }
     // handles animated transitions when swipe right, specifically height transitions between messages
     if (run_generate || run_swipe_right) {
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index e27a90fbc..a2ee59e15 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -472,9 +472,9 @@ function switchCompactInputArea() {
     $('#compact_input_area').prop('checked', power_user.compact_input_area);
 }
 
-export function switchSwipeNumAllMessages() {
+function switchSwipeNumAllMessages() {
     $('#show_swipe_num_all_messages').prop('checked', power_user.show_swipe_num_all_messages);
-    $('.mes:not(.last_mes) .swipes-counter').css('opacity', '').toggle(power_user.show_swipe_num_all_messages);
+    $('body').toggleClass('swipeAllMessages', !!power_user.show_swipe_num_all_messages);
 }
 
 var originalSliderValues = [];
diff --git a/public/style.css b/public/style.css
index 69ff17b49..b147f9c87 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1044,6 +1044,16 @@ body .panelControlBar {
     opacity: 0.3;
 }
 
+body:not(.swipeAllMessages) .mes:not(.last_mes) .swipes-counter {
+    display: none;
+}
+
+body.swipeAllMessages .mes:not(.last_mes) .swipes-counter {
+    /* Avoid expensive DOM queries */
+    opacity: 0.3 !important;
+    display: flex !important;
+}
+
 .swipe_left {
     right: auto;
     left: 20px;

From 3dd1e25a3bece79544caf2a376ed96b47c5a1fbe Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:56:17 +0000
Subject: [PATCH 2/5] Hide past swipes with opacity

---
 public/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/style.css b/public/style.css
index b147f9c87..4444d0080 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1045,7 +1045,7 @@ body .panelControlBar {
 }
 
 body:not(.swipeAllMessages) .mes:not(.last_mes) .swipes-counter {
-    display: none;
+    opacity: 0;
 }
 
 body.swipeAllMessages .mes:not(.last_mes) .swipes-counter {

From dce63f52c0acc72f8d902853146bb64e94c9308e Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 6 Dec 2024 20:21:01 +0200
Subject: [PATCH 3/5] Remove SD module worker

---
 .../scripts/extensions/stable-diffusion/index.js  | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index b175860c8..7a302f392 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -60,7 +60,6 @@ import { ToolManager } from '../../tool-calling.js';
 export { MODULE_NAME };
 
 const MODULE_NAME = 'sd';
-const UPDATE_INTERVAL = 1000;
 // This is a 1x1 transparent PNG
 const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
 const CUSTOM_STOP_EVENT = 'sd_stop_generation';
@@ -3687,8 +3686,6 @@ async function addSDGenButtons() {
     const button = $('#sd_gen');
     const dropdown = $('#sd_dropdown');
     dropdown.hide();
-    button.hide();
-    messageButton.hide();
 
     let popper = Popper.createPopper(button.get(0), dropdown.get(0), {
         placement: 'top',
@@ -3770,18 +3767,6 @@ function isValidState() {
     }
 }
 
-async function moduleWorker() {
-    if (isValidState()) {
-        $('#sd_gen').show();
-        $('.sd_message_gen').show();
-    }
-    else {
-        $('#sd_gen').hide();
-        $('.sd_message_gen').hide();
-    }
-}
-
-setInterval(moduleWorker, UPDATE_INTERVAL);
 let buttonAbortController = null;
 
 async function sdMessageButton(e) {

From d5221760a3ec572db1b69484e8af9221198c855f Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 6 Dec 2024 20:24:22 +0200
Subject: [PATCH 4/5] Hide swipe counter with visibility

---
 public/style.css | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/style.css b/public/style.css
index 4444d0080..6f935ec4c 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1040,12 +1040,8 @@ body .panelControlBar {
     height: var(--swipeCounterHeight);
 }
 
-.mes:not(.last_mes) .swipes-counter {
-    opacity: 0.3;
-}
-
 body:not(.swipeAllMessages) .mes:not(.last_mes) .swipes-counter {
-    opacity: 0;
+    visibility: hidden;
 }
 
 body.swipeAllMessages .mes:not(.last_mes) .swipes-counter {

From 1a8e37d3a5f9a9d1d954a3d569f229eea6b2c329 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 6 Dec 2024 20:54:45 +0200
Subject: [PATCH 5/5] Remove counter hide on right swipe

---
 public/script.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/script.js b/public/script.js
index c7744984e..2311626b2 100644
--- a/public/script.js
+++ b/public/script.js
@@ -8535,8 +8535,6 @@ const swipe_right = () => {
     }
     if (run_generate) {               //hide swipe arrows while generating
         this_div.css('display', 'none');
-        const swipesCounter = currentMessage.find('.swipes-counter');
-        swipesCounter.hide();
     }
     // handles animated transitions when swipe right, specifically height transitions between messages
     if (run_generate || run_swipe_right) {