Skip to content

Commit

Permalink
Fix body margin shifting with modals, fix error on project column edit (
Browse files Browse the repository at this point in the history
go-gitea#30831)

Fixes: go-gitea#30816, regression from
go-gitea#30723.
Fixes: go-gitea#30815, regression from
go-gitea#30723.

Fomantic [expects a
callback](https://github.com/fomantic/Fomantic-UI/blob/59d9b409879ad9413ea0a3efa4ab2e51017ad9b9/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 <[email protected]>
  • Loading branch information
silverwind and wxiaoguang authored May 3, 2024
1 parent c445a85 commit b30b7df
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions web_src/js/modules/fomantic/dimmer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import {queryElemChildren} from '../../utils/dom.js';

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

0 comments on commit b30b7df

Please sign in to comment.