Skip to content

Commit 9787bdf

Browse files
mvorisekmvorisek
authored
Upgrade Fomantic-UI to 2.10.0-beta.17 (#2277)
1 parent 4734697 commit 9787bdf

File tree

6 files changed

+47
-54
lines changed

6 files changed

+47
-54
lines changed

‎public/external/fomantic-ui/dist/semantic.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* # Fomantic UI - 2.10.0-beta.16+fd10e3b
2+
* # Fomantic UI - 2.10.0-beta.17+3be2655
33
* https://github.com/fomantic/Fomantic-UI
44
* https://fomantic-ui.com/
55
*

‎public/external/fomantic-ui/dist/semantic.js‎

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* # Fomantic UI - 2.10.0-beta.16+fd10e3b
2+
* # Fomantic UI - 2.10.0-beta.17+3be2655
33
* https://github.com/fomantic/Fomantic-UI
44
* https://fomantic-ui.com/
55
*
@@ -7290,7 +7290,7 @@
72907290
}
72917291
if (settings.allowAdditions) {
72927292
module.add.userSuggestion(settings.preserveHTML
7293-
? module.escape.htmlEntities(query)
7293+
? settings.templates.escape(query)
72947294
: query);
72957295
}
72967296
if (module.is.searchSelection() && module.can.show() && module.is.focusedOnSearch() && !module.is.empty()) {
@@ -7374,7 +7374,7 @@
73747374
if (values.length === 0 && !settings.allowAdditions) {
73757375
module.add.message(message.noResults);
73767376
} else {
7377-
let value = module.is.multiple() ? module.get.values(true) : module.get.value();
7377+
let value = module.is.multiple() ? module.get.values() : module.get.value();
73787378
if (value !== '') {
73797379
module.verbose('Value(s) present after click icon, select value(s) in items');
73807380
module.set.selected(value, null, true, true);
@@ -7603,12 +7603,9 @@
76037603
$input.html('');
76047604
$input.append('<option disabled selected value></option>');
76057605
$.each(values, function (index, item) {
7606-
let value = settings.templates.escape(item[fields.value]);
7607-
let name = settings.templates.escape(
7608-
item[fields.name] || '',
7609-
settings
7610-
);
7611-
$input.append('<option value="' + value + '"' + (item.selected === true ? ' selected' : '') + '>' + name + '</option>');
7606+
let value = item[fields.value];
7607+
let name = item[fields.name] || '';
7608+
$input.append('<option value="' + settings.templates.escape(value) + '"' + (item.selected === true ? ' selected' : '') + '>' + settings.templates.escape(name, settings) + '</option>');
76127609
});
76137610
module.observe.select();
76147611
}
@@ -7621,9 +7618,10 @@
76217618
let tokens = pasteValue.split(settings.delimiter);
76227619
let notFoundTokens = [];
76237620
tokens.forEach(function (value) {
7621+
value = value.trim();
76247622
const valueTrimmed = settings.preserveHTML
7625-
? module.escape.htmlEntities(value.trim())
7626-
: value.trim();
7623+
? settings.templates.escape(value)
7624+
: value;
76277625
if (module.set.selected(valueTrimmed, null, false, true) === false) {
76287626
notFoundTokens.push(valueTrimmed);
76297627
}
@@ -8394,7 +8392,7 @@
83948392
: settings.transition;
83958393
},
83968394
userValues: function () {
8397-
let values = module.get.values(true);
8395+
let values = module.get.values();
83988396
if (!values) {
83998397
return false;
84008398
}
@@ -8444,22 +8442,20 @@
84448442
? ''
84458443
: value;
84468444
},
8447-
values: function (raw) {
8445+
values: function () {
84488446
let value = module.get.value();
84498447
if (value === '') {
84508448
return '';
84518449
}
84528450

84538451
return !module.has.selectInput() && module.is.multiple()
84548452
? (typeof value === 'string' // delimited string
8455-
? (raw
8456-
? value
8457-
: module.escape.htmlEntities(value)).split(settings.delimiter)
8453+
? value.split(settings.delimiter)
84588454
: '')
84598455
: value;
84608456
},
84618457
remoteValues: function () {
8462-
let values = module.get.values(true);
8458+
let values = module.get.values();
84638459
let remoteValues = false;
84648460
if (values) {
84658461
if (typeof values === 'string') {
@@ -8615,8 +8611,8 @@
86158611
let isMultiple;
86168612
value = value !== undefined
86178613
? value
8618-
: (module.get.values(true) !== undefined
8619-
? module.get.values(true)
8614+
: (module.get.values() !== undefined
8615+
? module.get.values()
86208616
: module.get.text());
86218617
isMultiple = module.is.multiple() && Array.isArray(value);
86228618
shouldSearch = isMultiple
@@ -8653,7 +8649,7 @@
86538649
optionValue = optionValue.toLowerCase();
86548650
value = value.toLowerCase();
86558651
}
8656-
if (module.escape.htmlEntities(String(optionValue)) === module.escape.htmlEntities(String(value))) {
8652+
if (String(optionValue) === String(value)) {
86578653
module.verbose('Found select item by value', optionValue, value);
86588654
$selectedItem = $choice;
86598655

@@ -9119,7 +9115,7 @@
91199115
$input.addClass(className.noselection);
91209116
}
91219117
let hasInput = $input.length > 0;
9122-
let currentValue = module.get.values(true);
9118+
let currentValue = module.get.values();
91239119
let stringValue = value !== undefined
91249120
? String(value)
91259121
: value;
@@ -9407,7 +9403,7 @@
94079403
$selectedItem = undefined;
94089404
addedText = undefined;
94099405
}
9410-
let currentValue = module.get.values(true);
9406+
let currentValue = module.get.values();
94119407
let newValue;
94129408
if (module.has.value(addedValue)) {
94139409
module.debug('Value already selected');
@@ -9421,7 +9417,9 @@
94219417
}
94229418
// extend current array
94239419
if (Array.isArray(currentValue)) {
9424-
newValue = $selectedItem && $selectedItem.hasClass(className.actionable) ? currentValue : currentValue.concat([addedValue]);
9420+
newValue = $selectedItem && $selectedItem.hasClass(className.actionable)
9421+
? currentValue
9422+
: currentValue.concat([addedValue]);
94259423
newValue = module.get.uniqueArray(newValue);
94269424
} else {
94279425
newValue = [addedValue];
@@ -9564,7 +9562,7 @@
95649562
$item.removeClass(className.selected);
95659563
},
95669564
value: function (removedValue, removedText, $removedItem, preventChangeTrigger) {
9567-
let values = module.get.values(true);
9565+
let values = module.get.values();
95689566
let newValue;
95699567
if (module.has.selectInput()) {
95709568
module.verbose('Input is <select> removing selected option', removedValue);
@@ -9734,15 +9732,15 @@
97349732
: module.has.valueMatchingCase(value);
97359733
},
97369734
valueMatchingCase: function (value) {
9737-
let values = module.get.values(true);
9735+
let values = module.get.values();
97389736
let hasValue = Array.isArray(values)
97399737
? values && ($.inArray(value, values) !== -1)
97409738
: values == value;
97419739

97429740
return !!hasValue;
97439741
},
97449742
valueIgnoringCase: function (value) {
9745-
let values = module.get.values(true);
9743+
let values = module.get.values();
97469744
let hasValue = false;
97479745
if (!Array.isArray(values)) {
97489746
values = [values];
@@ -10122,17 +10120,6 @@
1012210120

1012310121
return text.replace(regExp.escape, '\\$&');
1012410122
},
10125-
htmlEntities: function (string) {
10126-
const escapeMap = {
10127-
'"': '&quot;',
10128-
'&': '&amp;',
10129-
"'": '&apos;',
10130-
'<': '&lt;',
10131-
'>': '&gt;',
10132-
};
10133-
10134-
return String(string).replace(/["&'<>]/g, (chr) => escapeMap[chr]);
10135-
},
1013610123

1013710124
// https://github.com/fomantic/Fomantic-UI/issues/2782
1013810125
// https://jsfiddle.net/3efL7jnt/

‎public/external/fomantic-ui/dist/semantic.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/external/fomantic-ui/dist/semantic.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/external/package-lock.json‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Form/Control/Lookup.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,15 @@ protected function initDropdown($jsChain): void
383383
$idField = $this->idField
384384
?? $this->model->idField;
385385

386-
$entity = $this->model->loadBy($idField, $this->entityField->get());
387-
388-
$settings['values'] = [array_merge($this->renderRow($entity), ['selected' => true])];
386+
foreach ($this->model->createIteratorBy(
387+
$idField,
388+
$this->multiple && $this->entityField->getField()->type === 'json' && is_array($this->entityField->get())
389+
? 'in'
390+
: '=',
391+
$this->entityField->get()
392+
) as $entity) {
393+
$settings['values'][] = array_merge($this->renderRow($entity), ['selected' => true]);
394+
}
389395
}
390396

391397
$jsChain->dropdown($settings);

0 commit comments

Comments
 (0)