Merge pull request #2908 from SillyTavern/gallery-improvements Improve gallery layout
Signed| @@ -26,9 +26,11 @@ let paginationVisiblePages = 10; | |||
| 26 | let paginationMaxLinesPerPage = 2; | 26 | let paginationMaxLinesPerPage = 2; |
| 27 | let galleryMaxRows = 3; | 27 | let galleryMaxRows = 3; |
| 28 | 28 | ||
| 29 | $('body').on('click', '.dragClose', function () { | 29 | // Remove all draggables associated with the gallery |
| 30 | const relatedId = $(this).data('related-id'); // Get the ID of the related draggable | 30 | $('#movingDivs').on('click', '.dragClose', function () { |
| 31 | $(`body > .draggable[id="${relatedId}"]`).remove(); // Remove the associated draggable | 31 | const relatedId = $(this).data('related-id'); |
| 32 | if (!relatedId) return; | ||
| 33 | $(`#movingDivs > .draggable[id="${relatedId}"]`).remove(); | ||
| 32 | }); | 34 | }); |
| 33 | 35 | ||
| 34 | const CUSTOM_GALLERY_REMOVED_EVENT = 'galleryRemoved'; | 36 | const CUSTOM_GALLERY_REMOVED_EVENT = 'galleryRemoved'; |
| @@ -290,7 +292,7 @@ function makeMovable(id = 'gallery') { | |||
| 290 | 292 | ||
| 291 | $('#dragGallery').css('display', 'block'); | 293 | $('#dragGallery').css('display', 'block'); |
| 292 | 294 | ||
| 293 | $('body').append(newElement); | 295 | $('#movingDivs').append(newElement); |
| 294 | 296 | ||
| 295 | loadMovingUIState(); | 297 | loadMovingUIState(); |
| 296 | $(`.draggable[forChar="${id}"]`).css('display', 'block'); | 298 | $(`.draggable[forChar="${id}"]`).css('display', 'block'); |
| @@ -362,8 +364,8 @@ function makeDragImg(id, url) { | |||
| 362 | } | 364 | } |
| 363 | } | 365 | } |
| 364 | 366 | ||
| 365 | // Step 3: Attach it to the body | 367 | // Step 3: Attach it to the movingDivs container |
| 366 | document.body.appendChild(newElement); | 368 | document.getElementById('movingDivs').appendChild(newElement); |
| 367 | 369 | ||
| 368 | // Step 4: Call dragElement and loadMovingUIState | 370 | // Step 4: Call dragElement and loadMovingUIState |
| 369 | const appendedElement = document.getElementById(uniqueId); | 371 | const appendedElement = document.getElementById(uniqueId); |
| @@ -5386,13 +5386,6 @@ body:not(.movingUI) .drawer-content.maximized { | |||
| 5386 | 5386 | ||
| 5387 | /* Jank mobile support for gallery and future draggables */ | 5387 | /* Jank mobile support for gallery and future draggables */ |
| 5388 | @media screen and (max-width: 1000px) { | 5388 | @media screen and (max-width: 1000px) { |
| 5389 | #gallery { | ||
| 5390 | display: block; | ||
| 5391 | width: 100vw; | ||
| 5392 | height: 100vh; | ||
| 5393 | z-index: 9999; | ||
| 5394 | } | ||
| 5395 | |||
| 5396 | .draggable { | 5389 | .draggable { |
| 5397 | display: block; | 5390 | display: block; |
| 5398 | width: 100vw; | 5391 | width: 100vw; |