Skip to content

Commit 1a4f693

Browse files
authored
Fix JS error and improve error message styles (#29963)
Fixes: #29956. This error exposed a existing bug in the code, it was just never noticed because the jQuery expression evaluated without error before while the new one doesn't. Also improves error message styles: Before: <img width="1338" alt="Screenshot 2024-03-21 at 09 16 07" src="https://github.com/go-gitea/gitea/assets/115237/1cc1ef89-ad94-491e-bbca-75387f7547a0"> After: <img width="1335" alt="Screenshot 2024-03-21 at 09 15 44" src="https://github.com/go-gitea/gitea/assets/115237/312efc79-5353-4e2a-a703-1bccd3c01736">
1 parent 82db9a2 commit 1a4f693

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

web_src/js/bootstrap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function showGlobalErrorMessage(msg) {
2323
let msgDiv = pageContent.querySelector(`.js-global-error[data-global-error-msg-compact="${msgCompact}"]`);
2424
if (!msgDiv) {
2525
const el = document.createElement('div');
26-
el.innerHTML = `<div class="ui container negative message center aligned js-global-error" style="white-space: pre-line;"></div>`;
26+
el.innerHTML = `<div class="ui container negative message center aligned js-global-error tw-mt-[15px] tw-whitespace-pre-line"></div>`;
2727
msgDiv = el.childNodes[0];
2828
}
2929
// merge duplicated messages into "the message (count)" format

web_src/js/features/repo-common.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ export function initRepoCommonBranchOrTagDropdown(selector) {
7676

7777
export function initRepoCommonFilterSearchDropdown(selector) {
7878
const $dropdown = $(selector);
79+
if (!$dropdown.length) return;
80+
7981
$dropdown.dropdown({
8082
fullTextSearch: 'exact',
8183
selectOnKeydown: false,

0 commit comments

Comments
 (0)