Merge pull request #3793 from Erquint/staging Clickable image attachments — no more fiddling with the spyglass button.
Signed| @@ -575,8 +575,8 @@ export function isExternalMediaAllowed() { | ||
| 575 | 575 | return !power_user.forbid_external_media; |
| 576 | 576 | } |
| 577 | 577 | |
| 578 | 578 | async function enlargeMessageImageexpandMessageImage(event) { |
| 579 | 579 | const mesBlock = $(thisevent.currentTarget).closest('.mes'); |
| 580 | 580 | const mesId = mesBlock.attr('mesid'); |
| 581 | 581 | const message = chat[mesId]; |
| 582 | 582 | const imgSrc = message?.extra?.image; |
| @@ -620,7 +620,12 @@ async function enlargeMessageImage() { | ||
| 620 | 620 | popup.completeCancelled(); |
| 621 | 621 | }); |
| 622 | 622 | |
| 623 | 623 | await popup.show(); |
| 624 | + return img; | |
| 625 | +} | |
| 626 | + | |
| 627 | +function expandAndZoomMessageImage(event) { | |
| 628 | + expandMessageImage(event).click(); | |
| 624 | 629 | } |
| 625 | 630 | |
| 626 | 631 | async function deleteMessageImage() { |
| @@ -1603,7 +1608,8 @@ jQuery(function () { | ||
| 1603 | 1608 | reloadCurrentChat(); |
| 1604 | 1609 | }); |
| 1605 | 1610 | |
| 1606 | 1611 | $(document).on('click', '.mes_img_enlargemes_img', enlargeMessageImageexpandMessageImage); |
| 1612 | + $(document).on('click', '.mes_img_enlarge', expandAndZoomMessageImage); | |
| 1607 | 1613 | $(document).on('click', '.mes_img_delete', deleteMessageImage); |
| 1608 | 1614 | |
| 1609 | 1615 | $('#file_form_input').on('change', async () => { |
| @@ -4995,6 +4995,7 @@ a:hover { | ||
| 4995 | 4995 | max-width: 100%; |
| 4996 | 4996 | max-height: 40vh; |
| 4997 | 4997 | image-rendering: -webkit-optimize-contrast; |
| 4998 | + cursor: pointer; | |
| 4998 | 4999 | } |
| 4999 | 5000 | |
| 5000 | 5001 | .mes_img_swipes, |