Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ cpu.out
/public/assets/fonts
/public/assets/img/avatar
/vendor
/web_src/fomantic
/VERSION
/.air
/.go-licenses
Expand Down
14 changes: 3 additions & 11 deletions web_src/fomantic/build/components/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions web_src/fomantic/build/components/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [],
Expand Down Expand Up @@ -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)
;
});
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]) + '">';
}
Expand Down
6 changes: 1 addition & 5 deletions web_src/fomantic/build/fomantic.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 0 additions & 2 deletions web_src/js/modules/fomantic.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import $ from 'jquery';
import {initFomanticApiPatch} from './fomantic/api.ts';
import {initAriaCheckboxPatch} from './fomantic/checkbox.ts';
import {initAriaFormFieldPatch} from './fomantic/form.ts';
import {initAriaDropdownPatch} from './fomantic/dropdown.ts';
Expand Down Expand Up @@ -27,7 +26,6 @@ export function initGiteaFomantic() {
initFomanticTransition();
initFomanticDimmer();
initFomanticTab();
initFomanticApiPatch();

// Use the patches to improve accessibility, these patches are designed to be as independent as possible, make it easy to modify or remove in the future.
initAriaCheckboxPatch();
Expand Down
41 changes: 0 additions & 41 deletions web_src/js/modules/fomantic/api.ts

This file was deleted.