Prevent rollover on keyboard left swipe if repeating (#3644) * Prevent rollover on keyboard left swipe if repeating Closes #3636 * Ditto for right swipe * Remove goofy comment leftover

cabd6de85b5db765c3efba0371e45086f4d6e6f3

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/script.js+26 -5 Viewed

     return `${current}\u200b/\u200b${total}`;
+}
-function swipe_left() {      // when we swipe left..but no generation.
+/**
+ * Handles the swipe to the left event.
+ * @param {JQuery.Event} _event Event.
+ * @param {object} params Additional parameters.
+ * @param {string} [params.source] The source of the swipe event.
+ * @param {boolean} [params.repeated] Is the swipe event repeated.
+ */
+function swipe_left(_event, { source, repeated } = {}) {
     if (chat.length - 1 === Number(this_edit_mes_id)) {
         closeMessageEditor();
+    }
     if (isStreamingEnabled() && streamingProcessor) {
         streamingProcessor.onStopStreaming();
+    }

     // Make sure ad-hoc changes to extras are saved before swiping away
     syncMesToSwipe();
+    // If the user is holding down the key and we're at the first swipe, don't do anything
+    if (source === 'keyboard' && repeated && chat[chat.length - 1].swipe_id === 0) {
+        return;
+    }
     const swipe_duration = 120;
     const swipe_range = '700px';
     chat[chat.length - 1]['swipe_id']--;

@@ -8883,8 +8894,14 @@ function swipe_left() { // when we swipe left..but no generation.
8883	}	8894	}
8884	}	8895	}
8885		8896
8886	// when we click swipe right button	8897	/**
8887	const swipe_right = () => {	8898	* Handles the swipe to the right event.
		8899	* @param {JQuery.Event} _event Event.
		8900	* @param {object} params Additional parameters.
		8901	* @param {string} [params.source] The source of the swipe event.
		8902	* @param {boolean} [params.repeated] Is the swipe event repeated.
		8903	*/
		8904	function swipe_right(_event, { source, repeated } = {}) {
8888	if (chat.length - 1 === Number(this_edit_mes_id)) {	8905	if (chat.length - 1 === Number(this_edit_mes_id)) {
8889	closeMessageEditor();	8906	closeMessageEditor();
8890	}	8907	}

     if (chat.length === 1 && chat[0]['swipe_id'] !== undefined && chat[0]['swipe_id'] === chat[0]['swipes'].length - 1) {    // if swipe_right is called on the last alternate greeting, loop back around
         chat[0]['swipe_id'] = 0;
     } else {
+        // If the user is holding down the key and we're at the last swipe, don't do anything
+        if (source === 'keyboard' && repeated && chat[chat.length - 1].swipe_id === chat[chat.length - 1].swipes.length - 1) {
+            return;
+        }
         chat[chat.length - 1]['swipe_id']++;                                // make new slot in array
+    }
     if (chat[chat.length - 1].extra) {

             },
         });
+    }
-};
+}
 export const CONNECT_API_MAP = {
     // Default APIs not contined inside text gen / chat gen

public/scripts/RossAscends-mods.js+2 -2 Viewed

@@ -1143,7 +1143,7 @@ export function initRossMods() {
1143	$('#shadow_select_chat_popup').css('display') === 'none' &&	1143	$('#shadow_select_chat_popup').css('display') === 'none' &&
1144	!isInputElementInFocus()	1144	!isInputElementInFocus()
1145	) {	1145	) {
1146	$('.swipe_left:last').click();	1146	$('.swipe_left:last').trigger('click', { source: 'keyboard', repeated: event.repeat });
1147	return;	1147	return;
1148	}	1148	}
1149	}	1149	}

@@ -1156,7 +1156,7 @@ export function initRossMods() {
1156	$('#shadow_select_chat_popup').css('display') === 'none' &&	1156	$('#shadow_select_chat_popup').css('display') === 'none' &&
1157	!isInputElementInFocus()	1157	!isInputElementInFocus()
1158	) {	1158	) {
1159	$('.swipe_right:last').click();	1159	$('.swipe_right:last').trigger('click', { source: 'keyboard', repeated: event.repeat });
1160	return;	1160	return;
1161	}	1161	}
1162	}	1162	}