1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-23 02:38:35 +00:00

Fix various Fomantic UI and htmx problems (#33851)

Also fix #31328, fix #33854
This commit is contained in:
wxiaoguang
2025-03-12 02:35:05 +08:00
committed by GitHub
parent 651ef66966
commit 91610a987e
8 changed files with 16 additions and 68 deletions

View File

@@ -754,17 +754,9 @@ $.api = $.fn.api = function(parameters) {
;
},
urlEncodedValue: function(value) {
var
decodedValue = window.decodeURIComponent(value),
encodedValue = window.encodeURIComponent(value),
alreadyEncoded = (decodedValue !== value)
;
if(alreadyEncoded) {
module.debug('URL value is already encoded, avoiding double encoding', value);
return value;
}
module.verbose('Encoding value using encodeURIComponent', value, encodedValue);
return encodedValue;
// GITEA-PATCH: always encode the value.
// Old code does "decodeURIComponent" first to guess whether the value is encoded, it is not right.
return window.encodeURIComponent(value);
},
defaultData: function() {
var

View File

@@ -31,9 +31,9 @@ $.fn.dropdown = function(parameters) {
moduleSelector = $allModules.selector || '',
hasTouch = ('ontouchstart' in document.documentElement),
clickEvent = hasTouch
? 'touchstart'
: 'click',
// GITEA-PATCH: always "click" as clickEvent, old code used "touchstart" as clickEvent, it is wrong,
// because "touchstart" caused problems when users try to scroll and the touch point is in the dropdown.
clickEvent = 'click',
time = new Date().getTime(),
performance = [],
@@ -768,7 +768,7 @@ $.fn.dropdown = function(parameters) {
preSelected = preSelected && preSelected!=="" ? preSelected.split(settings.delimiter) : [];
}
$.each(preSelected,function(index,value){
$item.filter('[data-value="'+value+'"]')
$item.filter('[data-value="'+CSS.escape(value)+'"]') // GITEA-PATCH: use "CSS.escape" for query selector
.addClass(className.filtered)
;
});
@@ -1027,7 +1027,7 @@ $.fn.dropdown = function(parameters) {
$input.append('<option disabled selected value></option>');
$.each(values, function(index, item) {
var
value = settings.templates.deQuote(item[fields.value]),
value = settings.templates.escape(item[fields.value]), // GITEA-PATCH: use "escape" for attribute value
name = settings.templates.escape(
item[fields.name] || '',
settings.preserveHTML
@@ -4180,13 +4180,14 @@ $.fn.dropdown.settings.templates = {
if( itemType === 'item' ) {
var
maybeText = (option[fields.text])
? ' data-text="' + deQuote(option[fields.text]) + '"'
? ' data-text="' + escape(option[fields.text]) + '"' // GITEA-PATCH: use "escape" for attribute value
: '',
maybeDisabled = (option[fields.disabled])
? className.disabled+' '
: ''
;
html += '<div class="'+ maybeDisabled + (option[fields.class] ? deQuote(option[fields.class]) : className.item)+'" data-value="' + deQuote(option[fields.value]) + '"' + maybeText + '>';
// GITEA-PATCH: use "escape" for attribute value
html += '<div class="'+ maybeDisabled + (option[fields.class] ? deQuote(option[fields.class]) : className.item)+'" data-value="' + escape(option[fields.value]) + '"' + maybeText + '>';
if(option[fields.image]) {
html += '<img class="'+(option[fields.imageClass] ? deQuote(option[fields.imageClass]) : className.image)+'" src="' + deQuote(option[fields.image]) + '">';
}

View File

@@ -3,8 +3,4 @@ import './components/dropdown.js';
import './components/modal.js';
import './components/search.js';
// Hard forked from Fomantic 2.8.7
// TODO: need to apply the patch from Makefile
// # fomantic uses "touchstart" as click event for some browsers, it's not ideal, so we force fomantic to always use "click" as click event
// $(SED_INPLACE) -e 's/clickEvent[ \t]*=/clickEvent = "click", unstableClickEvent =/g' $(FOMANTIC_WORK_DIR)/build/semantic.js
// Hard-forked from Fomantic UI 2.8.7, patches are commented with "GITEA-PATCH"