Refactored swipe and moved messageEdit to a separate function. (#4610)
* Extracted `messageEdit` and `messageEditCancel` from `.mes_edit` and `.mes_edit_cancel` * Fixed. https://github.com/SillyTavern/SillyTavern/pull/4633#discussion_r241505 https://github.com/SillyTavern/SillyTavern/pull/4633#pullrequestreview-3316588180 * Refactored `swipe` and moved `messageEdit` to a separate function. Also, a few more minor changes. * Fixed bug. https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2404789035 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2404789038 * Fixed. https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408682277 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408689706 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408690772 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408697066 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408705156 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408708088 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408725971 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408726241 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408740050 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408745918 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408753165 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408761262 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408764531 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408781694 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408784426 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408794672 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408802366 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408803433 * Fixed: https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408702506 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408805635 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2410368443 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2408791120 * Bugfixes. Incomplete. * Fix formatting * Use scrollTop because scrollIntoView breaks layout on phones. * Only show '?' in `formaSwipeCounter` if something is wrong. https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2412169005 * Respect animation_duration if it's >= 0. * Disabled expandNewMessage's animation on Cohee's request. https://github.com/SillyTavern/SillyTavern/pull/4610/files#r2408731744 * Only hide the swipe counter when a generation is ongoing. https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2440588779 * refreshSwipeButtons * Adjust swipeDuration constant * feat: add refreshSwipeButtons and isSwipingAllowed to context * Fixed image swipes. https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2442489827 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2442490042 * Fixed. https://github.com/SillyTavern/SillyTavern/pull/4610#issuecomment-3418657967 * Fixed: https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2442480238 * Fixed. https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2442536011 * Minor refactor. * Fixed: https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2443359660 https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2443359435 * Fixed: https://github.com/SillyTavern/SillyTavern/pull/4610#discussion_r2443357913 * Fix registration of click events * Fix passing data to swipe events --------- Co-authored-by: user <user@exmaple.com> Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
This commit is contained in:
@@ -19,6 +19,7 @@ import {
|
||||
substituteParams,
|
||||
sendTextareaMessage,
|
||||
doNavbarIconClick,
|
||||
isSwipingAllowed,
|
||||
} from '../script.js';
|
||||
|
||||
import {
|
||||
@@ -1109,8 +1110,8 @@ export function initRossMods() {
|
||||
|
||||
if (event.key == 'ArrowLeft') { //swipes left
|
||||
if (
|
||||
isSwipingAllowed &&
|
||||
!isNanogallery2LightboxActive() && // Check if lightbox is NOT active
|
||||
$('.swipe_left:last').css('display') === 'flex' &&
|
||||
$('#send_textarea').val() === '' &&
|
||||
$('#character_popup').css('display') === 'none' &&
|
||||
$('#shadow_select_chat_popup').css('display') === 'none' &&
|
||||
@@ -1123,8 +1124,8 @@ export function initRossMods() {
|
||||
}
|
||||
if (event.key == 'ArrowRight') { //swipes right
|
||||
if (
|
||||
isSwipingAllowed &&
|
||||
!isNanogallery2LightboxActive() && // Check if lightbox is NOT active
|
||||
$('.swipe_right:last').css('display') === 'flex' &&
|
||||
$('#send_textarea').val() === '' &&
|
||||
$('#character_popup').css('display') === 'none' &&
|
||||
$('#shadow_select_chat_popup').css('display') === 'none' &&
|
||||
|
||||
Reference in New Issue
Block a user