finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor imagediff and fix regression bug (#30694)

Browse source 
Fix #30683

(cherry picked from commit fd63b96f6a4c5b3ea9e53d37af85e0d2d09715b9)
This commit is contained in:
wxiaoguang 2024-04-25 21:01:38 +08:00 committed by Earl Warren
parent 93820d26ba
commit 5e81ae1798
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 102 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

188
web_src/js/features/imagediff.js
View file

@ -1,6 +1,6 @@
import $ from 'jquery'; import $ from 'jquery';
import {GET} from '../modules/fetch.js'; import {GET} from '../modules/fetch.js';
import {hideElem, loadElem} from '../utils/dom.js'; import {hideElem, loadElem, queryElemChildren} from '../utils/dom.js';
import {parseDom} from '../utils.js'; import {parseDom} from '../utils.js';
function getDefaultSvgBoundsIfUndefined(text, src) { function getDefaultSvgBoundsIfUndefined(text, src) {
@ -38,36 +38,36 @@ function getDefaultSvgBoundsIfUndefined(text, src) {
return null; return null;
} }
export function initImageDiff() { function createContext(imageAfter, imageBefore) {
function createContext(image1, image2) { const sizeAfter = {
const size1 = { width: imageAfter?.width || 0,
width: image1 && image1.width || 0, height: imageAfter?.height || 0,
height: image1 && image1.height || 0,
}; };
const size2 = { const sizeBefore = {
width: image2 && image2.width || 0, width: imageBefore?.width || 0,
height: image2 && image2.height || 0, height: imageBefore?.height || 0,
}; };
const max = { const maxSize = {
width: Math.max(size2.width, size1.width), width: Math.max(sizeBefore.width, sizeAfter.width),
height: Math.max(size2.height, size1.height), height: Math.max(sizeBefore.height, sizeAfter.height),
}; };
return { return {
$image1: $(image1), imageAfter,
$image2: $(image2), imageBefore,
size1, sizeAfter,
size2, sizeBefore,
max, maxSize,
ratio: [ ratio: [
Math.floor(max.width - size1.width) / 2, Math.floor(maxSize.width - sizeAfter.width) / 2,
Math.floor(max.height - size1.height) / 2, Math.floor(maxSize.height - sizeAfter.height) / 2,
Math.floor(max.width - size2.width) / 2, Math.floor(maxSize.width - sizeBefore.width) / 2,
Math.floor(max.height - size2.height) / 2, Math.floor(maxSize.height - sizeBefore.height) / 2,
], ],
}; };
} }
export function initImageDiff() {
$('.image-diff:not([data-image-diff-loaded])').each(async function() { $('.image-diff:not([data-image-diff-loaded])').each(async function() {
const $container = $(this); const $container = $(this);
this.setAttribute('data-image-diff-loaded', 'true'); this.setAttribute('data-image-diff-loaded', 'true');
@ -116,94 +116,96 @@ export function initImageDiff() {
initOverlay(createContext($imagesAfter[2], $imagesBefore[2])); initOverlay(createContext($imagesAfter[2], $imagesBefore[2]));
} }
this.querySelector(':scope > .image-diff-tabs')?.classList.remove('is-loading'); queryElemChildren(this, '.image-diff-tabs', (el) => el.classList.remove('is-loading'));
function initSideBySide(container, sizes) { function initSideBySide(container, sizes) {
let factor = 1; let factor = 1;
if (sizes.max.width > (diffContainerWidth - 24) / 2) { if (sizes.maxSize.width > (diffContainerWidth - 24) / 2) {
factor = (diffContainerWidth - 24) / 2 / sizes.max.width; factor = (diffContainerWidth - 24) / 2 / sizes.maxSize.width;
} }
const widthChanged = sizes.$image1.length !== 0 && sizes.$image2.length !== 0 && sizes.$image1[0].naturalWidth !== sizes.$image2[0].naturalWidth; const widthChanged = sizes.imageAfter && sizes.imageBefore && sizes.imageAfter.naturalWidth !== sizes.imageBefore.naturalWidth;
const heightChanged = sizes.$image1.length !== 0 && sizes.$image2.length !== 0 && sizes.$image1[0].naturalHeight !== sizes.$image2[0].naturalHeight; const heightChanged = sizes.imageAfter && sizes.imageBefore && sizes.imageAfter.naturalHeight !== sizes.imageBefore.naturalHeight;
if (sizes.$image1?.length) { if (sizes.imageAfter) {
const boundsInfoAfterWidth = container.querySelector('.bounds-info-after .bounds-info-width'); const boundsInfoAfterWidth = container.querySelector('.bounds-info-after .bounds-info-width');
boundsInfoAfterWidth.textContent = `${sizes.$image1[0].naturalWidth}px`; if (boundsInfoAfterWidth) {
if (widthChanged) boundsInfoAfterWidth.classList.add('green'); boundsInfoAfterWidth.textContent = `${sizes.imageAfter.naturalWidth}px`;
boundsInfoAfterWidth.classList.toggle('green', widthChanged);
}
const boundsInfoAfterHeight = container.querySelector('.bounds-info-after .bounds-info-height'); const boundsInfoAfterHeight = container.querySelector('.bounds-info-after .bounds-info-height');
boundsInfoAfterHeight.textContent = `${sizes.$image1[0].naturalHeight}px`; if (boundsInfoAfterHeight) {
if (heightChanged) boundsInfoAfterHeight.classList.add('green'); boundsInfoAfterHeight.textContent = `${sizes.imageAfter.naturalHeight}px`;
boundsInfoAfterHeight.classList.toggle('green', heightChanged);
}
} }
if (sizes.$image2?.length) { if (sizes.imageBefore) {
const boundsInfoBeforeWidth = container.querySelector('.bounds-info-before .bounds-info-width'); const boundsInfoBeforeWidth = container.querySelector('.bounds-info-before .bounds-info-width');
boundsInfoBeforeWidth.textContent = `${sizes.$image2[0].naturalWidth}px`; if (boundsInfoBeforeWidth) {
if (widthChanged) boundsInfoBeforeWidth.classList.add('red'); boundsInfoBeforeWidth.textContent = `${sizes.imageBefore.naturalWidth}px`;
boundsInfoBeforeWidth.classList.toggle('red', widthChanged);
}
const boundsInfoBeforeHeight = container.querySelector('.bounds-info-before .bounds-info-height'); const boundsInfoBeforeHeight = container.querySelector('.bounds-info-before .bounds-info-height');
boundsInfoBeforeHeight.textContent = `${sizes.$image2[0].naturalHeight}px`; if (boundsInfoBeforeHeight) {
if (heightChanged) boundsInfoBeforeHeight.classList.add('red'); boundsInfoBeforeHeight.textContent = `${sizes.imageBefore.naturalHeight}px`;
boundsInfoBeforeHeight.classList.add('red', heightChanged);
}
} }
const image1 = sizes.$image1[0]; if (sizes.imageAfter) {
if (image1) { const container = sizes.imageAfter.parentNode;
const container = image1.parentNode; sizes.imageAfter.style.width = `${sizes.sizeAfter.width * factor}px`;
image1.style.width = `${sizes.size1.width * factor}px`; sizes.imageAfter.style.height = `${sizes.sizeAfter.height * factor}px`;
image1.style.height = `${sizes.size1.height * factor}px`;
container.style.margin = '10px auto'; container.style.margin = '10px auto';
container.style.width = `${sizes.size1.width * factor + 2}px`; container.style.width = `${sizes.sizeAfter.width * factor + 2}px`;
container.style.height = `${sizes.size1.height * factor + 2}px`; container.style.height = `${sizes.sizeAfter.height * factor + 2}px`;
} }
const image2 = sizes.$image2[0]; if (sizes.imageBefore) {
if (image2) { const container = sizes.imageBefore.parentNode;
const container = image2.parentNode; sizes.imageBefore.style.width = `${sizes.sizeBefore.width * factor}px`;
image2.style.width = `${sizes.size2.width * factor}px`; sizes.imageBefore.style.height = `${sizes.sizeBefore.height * factor}px`;
image2.style.height = `${sizes.size2.height * factor}px`;
container.style.margin = '10px auto'; container.style.margin = '10px auto';
container.style.width = `${sizes.size2.width * factor + 2}px`; container.style.width = `${sizes.sizeBefore.width * factor + 2}px`;
container.style.height = `${sizes.size2.height * factor + 2}px`; container.style.height = `${sizes.sizeBefore.height * factor + 2}px`;
} }
} }
function initSwipe(sizes) { function initSwipe(sizes) {
let factor = 1; let factor = 1;
if (sizes.max.width > diffContainerWidth - 12) { if (sizes.maxSize.width > diffContainerWidth - 12) {
factor = (diffContainerWidth - 12) / sizes.max.width; factor = (diffContainerWidth - 12) / sizes.maxSize.width;
} }
const image1 = sizes.$image1[0]; if (sizes.imageAfter) {
if (image1) { const container = sizes.imageAfter.parentNode;
const container = image1.parentNode;
const swipeFrame = container.parentNode; const swipeFrame = container.parentNode;
image1.style.width = `${sizes.size1.width * factor}px`; sizes.imageAfter.style.width = `${sizes.sizeAfter.width * factor}px`;
image1.style.height = `${sizes.size1.height * factor}px`; sizes.imageAfter.style.height = `${sizes.sizeAfter.height * factor}px`;
container.style.margin = `0px ${sizes.ratio[0] * factor}px`; container.style.margin = `0px ${sizes.ratio[0] * factor}px`;
container.style.width = `${sizes.size1.width * factor + 2}px`; container.style.width = `${sizes.sizeAfter.width * factor + 2}px`;
container.style.height = `${sizes.size1.height * factor + 2}px`; container.style.height = `${sizes.sizeAfter.height * factor + 2}px`;
swipeFrame.style.padding = `${sizes.ratio[1] * factor}px 0 0 0`; swipeFrame.style.padding = `${sizes.ratio[1] * factor}px 0 0 0`;
swipeFrame.style.width = `${sizes.max.width * factor + 2}px`; swipeFrame.style.width = `${sizes.maxSize.width * factor + 2}px`;
} }
const image2 = sizes.$image2[0]; if (sizes.imageBefore) {
if (image2) { const container = sizes.imageBefore.parentNode;
const container = image2.parentNode;
const swipeFrame = container.parentNode; const swipeFrame = container.parentNode;
image2.style.width = `${sizes.size2.width * factor}px`; sizes.imageBefore.style.width = `${sizes.sizeBefore.width * factor}px`;
image2.style.height = `${sizes.size2.height * factor}px`; sizes.imageBefore.style.height = `${sizes.sizeBefore.height * factor}px`;
container.style.margin = `${sizes.ratio[3] * factor}px ${sizes.ratio[2] * factor}px`; container.style.margin = `${sizes.ratio[3] * factor}px ${sizes.ratio[2] * factor}px`;
container.style.width = `${sizes.size2.width * factor + 2}px`; container.style.width = `${sizes.sizeBefore.width * factor + 2}px`;
container.style.height = `${sizes.size2.height * factor + 2}px`; container.style.height = `${sizes.sizeBefore.height * factor + 2}px`;
swipeFrame.style.width = `${sizes.max.width * factor + 2}px`; swipeFrame.style.width = `${sizes.maxSize.width * factor + 2}px`;
swipeFrame.style.height = `${sizes.max.height * factor + 2}px`; swipeFrame.style.height = `${sizes.maxSize.height * factor + 2}px`;
} }
// extra height for inner "position: absolute" elements // extra height for inner "position: absolute" elements
const swipe = $container.find('.diff-swipe')[0]; const swipe = $container.find('.diff-swipe')[0];
if (swipe) { if (swipe) {
swipe.style.width = `${sizes.max.width * factor + 2}px`; swipe.style.width = `${sizes.maxSize.width * factor + 2}px`;
swipe.style.height = `${sizes.max.height * factor + 30}px`; swipe.style.height = `${sizes.maxSize.height * factor + 30}px`;
} }
$container.find('.swipe-bar').on('mousedown', function(e) { $container.find('.swipe-bar').on('mousedown', function(e) {
@ -229,39 +231,37 @@ export function initImageDiff() {
function initOverlay(sizes) { function initOverlay(sizes) {
let factor = 1; let factor = 1;
if (sizes.max.width > diffContainerWidth - 12) { if (sizes.maxSize.width > diffContainerWidth - 12) {
factor = (diffContainerWidth - 12) / sizes.max.width; factor = (diffContainerWidth - 12) / sizes.maxSize.width;
} }
const image1 = sizes.$image1[0]; if (sizes.imageAfter) {
if (image1) { const container = sizes.imageAfter.parentNode;
const container = image1.parentNode; sizes.imageAfter.style.width = `${sizes.sizeAfter.width * factor}px`;
image1.style.width = `${sizes.size1.width * factor}px`; sizes.imageAfter.style.height = `${sizes.sizeAfter.height * factor}px`;
image1.style.height = `${sizes.size1.height * factor}px`;
container.style.margin = `${sizes.ratio[1] * factor}px ${sizes.ratio[0] * factor}px`; container.style.margin = `${sizes.ratio[1] * factor}px ${sizes.ratio[0] * factor}px`;
container.style.width = `${sizes.size1.width * factor + 2}px`; container.style.width = `${sizes.sizeAfter.width * factor + 2}px`;
container.style.height = `${sizes.size1.height * factor + 2}px`; container.style.height = `${sizes.sizeAfter.height * factor + 2}px`;
} }
const image2 = sizes.$image2[0]; if (sizes.imageBefore) {
if (image2) { const container = sizes.imageBefore.parentNode;
const container = image2.parentNode;
const overlayFrame = container.parentNode; const overlayFrame = container.parentNode;
image2.style.width = `${sizes.size2.width * factor}px`; sizes.imageBefore.style.width = `${sizes.sizeBefore.width * factor}px`;
image2.style.height = `${sizes.size2.height * factor}px`; sizes.imageBefore.style.height = `${sizes.sizeBefore.height * factor}px`;
container.style.margin = `${sizes.ratio[3] * factor}px ${sizes.ratio[2] * factor}px`; container.style.margin = `${sizes.ratio[3] * factor}px ${sizes.ratio[2] * factor}px`;
container.style.width = `${sizes.size2.width * factor + 2}px`; container.style.width = `${sizes.sizeBefore.width * factor + 2}px`;
container.style.height = `${sizes.size2.height * factor + 2}px`; container.style.height = `${sizes.sizeBefore.height * factor + 2}px`;
// some inner elements are `position: absolute`, so the container's height must be large enough // some inner elements are `position: absolute`, so the container's height must be large enough
overlayFrame.style.width = `${sizes.max.width * factor + 2}px`; overlayFrame.style.width = `${sizes.maxSize.width * factor + 2}px`;
overlayFrame.style.height = `${sizes.max.height * factor + 2}px`; overlayFrame.style.height = `${sizes.maxSize.height * factor + 2}px`;
} }
const rangeInput = $container[0].querySelector('input[type="range"]'); const rangeInput = $container[0].querySelector('input[type="range"]');
function updateOpacity() { function updateOpacity() {
if (sizes?.$image1?.[0]) { if (sizes.imageAfter) {
sizes.$image1[0].parentNode.style.opacity = `${rangeInput.value / 100}`; sizes.imageAfter.parentNode.style.opacity = `${rangeInput.value / 100}`;
} }
} }
rangeInput?.addEventListener('input', updateOpacity); rangeInput?.addEventListener('input', updateOpacity);