From 8fd1279b0b85aa18a6abb9f346c1c4ebef1dbe57 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 26 Sep 2023 23:34:49 +0800 Subject: [PATCH 1/4] fix --- web_src/js/modules/fomantic.js | 70 ++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js index 3d4a66c1ea9dd..b1e79e2ed7477 100644 --- a/web_src/js/modules/fomantic.js +++ b/web_src/js/modules/fomantic.js @@ -25,41 +25,53 @@ export function initGiteaFomantic() { return escape(text, preserveHTML) + svg('octicon-x', 16, `${className.delete} icon`); }; + const transitionNopBehaviors = new Set([ + 'clear queue', 'stop', 'stop all', 'destroy', + 'force repaint', 'repaint', 'reset', + 'looping', 'remove looping', 'disable', 'enable', + 'set duration', 'save conditions', 'restore conditions', + ]); // stand-in for removed transition module - $.fn.transition = function (arg) { - if (arg === 'is supported') return true; - if (arg === 'is animating') return false; - if (arg === 'is inward') return false; - if (arg === 'is outward') return false; - if (arg === 'stop all') return; + $.fn.transition = function (arg0, arg1, arg2) { + if (arg0 === 'is supported') return true; + if (arg0 === 'is animating') return false; + if (arg0 === 'is inward') return false; + if (arg0 === 'is outward') return false; - const isIn = arg?.animation?.endsWith(' in'); - const isOut = arg?.animation?.endsWith(' out'); + let argObj; + if (typeof arg0 === 'string') { + // many behaviors are no-op now. https://fomantic-ui.com/modules/transition.html#/usage + if (transitionNopBehaviors.has(arg0)) return this; + // now, the arg0 is an animation name, the syntax: (animation, duration, complete) + argObj = {animation: arg0, ...(arg1 && {duration: arg1}), ...(arg2 && {onComplete: arg2})}; + } else if (typeof arg0 === 'object') { + argObj = arg0; + } else { + throw new Error(`invalid argument: ${arg0}`); + } - let ret; - if (arg === 'show' || isIn) { - arg?.onStart?.(this); - ret = this.each((_, el) => { + const isAnimationIn = argObj.animation?.startsWith('show') || argObj.animation?.endsWith(' in'); + const isAnimationOut = argObj.animation?.startsWith('hide') || argObj.animation?.endsWith(' out'); + this.each((_, el) => { + let toShow = isAnimationIn; + if (!isAnimationIn && !isAnimationOut) { + toShow = this.hasClass('hidden'); // it is a toggle animation + } + argObj.onStart?.(this); + if (toShow) { el.classList.remove('hidden'); - el.classList.add('visible'); - if (isIn) el.classList.add('transition'); - if (arg?.displayType) el.style.setProperty('display', arg.displayType, 'important'); - arg?.onShow?.(this); - }); - arg?.onComplete?.(this); - } else if (arg === 'hide' || isOut) { - arg?.onStart?.(this); - ret = this.each((_, el) => { + el.classList.add('visible', 'transition'); + if (argObj.displayType) el.style.setProperty('display', argObj.displayType, 'important'); + argObj.onShow?.(this); + } else { el.classList.add('hidden'); - el.classList.remove('visible'); - // don't remove the transition class because fomantic didn't do it either + el.classList.remove('visible'); // don't remove the transition class because the Fomantic animation style is `.hidden.transition`. el.style.removeProperty('display'); - arg?.onHidden?.(this); - }); - arg?.onComplete?.(this); - } - - return ret; + argObj.onHidden?.(this); + } + argObj.onComplete?.(this); + }); + return this; }; initFomanticApiPatch(); From 7f03e445e81eb219b5ada2a57af440813c1f2b38 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 26 Sep 2023 23:50:25 +0800 Subject: [PATCH 2/4] fix incorrect this --- web_src/js/modules/fomantic.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js index b1e79e2ed7477..2b043e48fafb7 100644 --- a/web_src/js/modules/fomantic.js +++ b/web_src/js/modules/fomantic.js @@ -57,19 +57,19 @@ export function initGiteaFomantic() { if (!isAnimationIn && !isAnimationOut) { toShow = this.hasClass('hidden'); // it is a toggle animation } - argObj.onStart?.(this); + argObj.onStart?.call(el); if (toShow) { el.classList.remove('hidden'); el.classList.add('visible', 'transition'); if (argObj.displayType) el.style.setProperty('display', argObj.displayType, 'important'); - argObj.onShow?.(this); + argObj.onShow?.call(el); } else { el.classList.add('hidden'); el.classList.remove('visible'); // don't remove the transition class because the Fomantic animation style is `.hidden.transition`. el.style.removeProperty('display'); - argObj.onHidden?.(this); + argObj.onHidden?.call(el); } - argObj.onComplete?.(this); + argObj.onComplete?.call(el); }); return this; }; From 5f64ff948e2cc5263a5efe8bfb09c7b4e46dff3b Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 27 Sep 2023 00:00:11 +0800 Subject: [PATCH 3/4] add comment --- web_src/js/modules/fomantic.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js index 2b043e48fafb7..c120f3a3f423a 100644 --- a/web_src/js/modules/fomantic.js +++ b/web_src/js/modules/fomantic.js @@ -55,7 +55,9 @@ export function initGiteaFomantic() { this.each((_, el) => { let toShow = isAnimationIn; if (!isAnimationIn && !isAnimationOut) { - toShow = this.hasClass('hidden'); // it is a toggle animation + // If the animation is not in/out, then it must be a toggle animation. + // Fomantic uses computed styles to check "visibility", but to avoid unnecessary arguments, here it only checks the class. + toShow = this.hasClass('hidden'); } argObj.onStart?.call(el); if (toShow) { From bf51ca5c219139efe7d503d38550ef8ecc46b8c1 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 27 Sep 2023 00:03:44 +0800 Subject: [PATCH 4/4] add comment --- web_src/js/modules/fomantic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js index c120f3a3f423a..9b52a5d429844 100644 --- a/web_src/js/modules/fomantic.js +++ b/web_src/js/modules/fomantic.js @@ -57,7 +57,7 @@ export function initGiteaFomantic() { if (!isAnimationIn && !isAnimationOut) { // If the animation is not in/out, then it must be a toggle animation. // Fomantic uses computed styles to check "visibility", but to avoid unnecessary arguments, here it only checks the class. - toShow = this.hasClass('hidden'); + toShow = this.hasClass('hidden'); // maybe it could also check "!this.hasClass('visible')", leave it to the future until there is a real problem. } argObj.onStart?.call(el); if (toShow) {