aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
Code

Fix body margin shifting with modals, fix error on project column edit (#30831)

Browse Source 
Fixes: https://github.com/go-gitea/gitea/issues/30816, regression from
https://github.com/go-gitea/gitea/pull/30723.
Fixes: https://github.com/go-gitea/gitea/pull/30815, regression from
https://github.com/go-gitea/gitea/pull/30723.

Fomantic [expects a
callback](59d9b40987/src/definitions/modules/modal.js (L530-L534))
to be called during `hide` which we did not do, so it could never remove
the margin it added to `body`.

I do observe the body content shifting to right by 1px when modal opens,
but this is a bug that existed on v1.21 as well, so not a regression.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
silverwind 2024-05-03 03:48:24 +02:00 committed by GitHub
parent c445a85528
commit b30b7df9f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web_src/js/modules/fomantic/dimmer.js
View File

@ -3,11 +3,12 @@ import {queryElemChildren} from '../../utils/dom.js';
export function initFomanticDimmer() { export function initFomanticDimmer() {
// stand-in for removed dimmer module // stand-in for removed dimmer module
$.fn.dimmer = function (arg0, $el) { $.fn.dimmer = function (arg0, arg1) {
if (arg0 === 'add content') { if (arg0 === 'add content') {
const $el = arg1;
const existingDimmer = document.querySelector('body > .ui.dimmer'); const existingDimmer = document.querySelector('body > .ui.dimmer');
if (existingDimmer) { if (existingDimmer) {
queryElemChildren(existingDimmer, '*', (el) => el.remove()); queryElemChildren(existingDimmer, '*', (el) => el.classList.add('hidden'));
this._dimmer = existingDimmer; this._dimmer = existingDimmer;
} else { } else {
this._dimmer = document.createElement('div'); this._dimmer = document.createElement('div');
@ -21,8 +22,10 @@ export function initFomanticDimmer() {
this._dimmer.classList.add('active'); this._dimmer.classList.add('active');
document.body.classList.add('tw-overflow-hidden'); document.body.classList.add('tw-overflow-hidden');
} else if (arg0 === 'hide') { } else if (arg0 === 'hide') {
const cb = arg1;
this._dimmer.classList.remove('active'); this._dimmer.classList.remove('active');
document.body.classList.remove('tw-overflow-hidden'); document.body.classList.remove('tw-overflow-hidden');
cb();
} }
return this; return this;
}; };