Skip to content

Commit 53163d7

Browse files
committed
Fix: Replace addSlashes with CSS.escape + Remove array.
1 parent 43a183d commit 53163d7

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/Autocomplete/assets/dist/controller.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
2929
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
3030
};
3131

32-
var _default_1_instances, _default_1_getCommonConfig, _default_1_createAutocomplete, _default_1_createAutocompleteWithHtmlContents, _default_1_createAutocompleteWithRemoteData, _default_1_stripTags, _default_1_addSlashes, _default_1_mergeObjects, _default_1_createTomSelect;
32+
var _default_1_instances, _default_1_getCommonConfig, _default_1_createAutocomplete, _default_1_createAutocompleteWithHtmlContents, _default_1_createAutocompleteWithRemoteData, _default_1_stripTags, _default_1_mergeObjects, _default_1_createTomSelect;
3333
class default_1 extends Controller {
3434
constructor() {
3535
super(...arguments);
@@ -270,7 +270,7 @@ _default_1_instances = new WeakSet(), _default_1_getCommonConfig = function _def
270270
let orderedOption = null;
271271
for (const [, tomSelectOption] of Object.entries(this.tomSelect.options)) {
272272
if (tomSelectOption.$order === optionOrder) {
273-
orderedOption = parentElement.querySelector(`:scope > option[value="${[__classPrivateFieldGet(this, _default_1_instances, "m", _default_1_addSlashes).call(this, this.tomSelect.settings.valueField)]}"]`);
273+
orderedOption = parentElement.querySelector(`:scope > option[value="${CSS.escape(tomSelectOption[this.tomSelect.settings.valueField])}"]`);
274274
break;
275275
}
276276
}
@@ -364,8 +364,6 @@ _default_1_instances = new WeakSet(), _default_1_getCommonConfig = function _def
364364
return __classPrivateFieldGet(this, _default_1_instances, "m", _default_1_createTomSelect).call(this, config);
365365
}, _default_1_stripTags = function _default_1_stripTags(string) {
366366
return string.replace(/(<([^>]+)>)/gi, '');
367-
}, _default_1_addSlashes = function _default_1_addSlashes(string) {
368-
return string.replace(/["\\]/g, '\\$&');
369367
}, _default_1_mergeObjects = function _default_1_mergeObjects(object1, object2) {
370368
return { ...object1, ...object2 };
371369
}, _default_1_createTomSelect = function _default_1_createTomSelect(options) {

src/Autocomplete/assets/src/controller.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ export default class extends Controller {
192192
for (const [, tomSelectOption] of Object.entries(this.tomSelect.options)) {
193193
if (tomSelectOption.$order === optionOrder) {
194194
orderedOption = parentElement.querySelector(
195-
`:scope > option[value="${[this.#addSlashes(this.tomSelect.settings.valueField)]}"]`
195+
`:scope > option[value="${CSS.escape(tomSelectOption[this.tomSelect.settings.valueField])}"]`
196196
);
197197

198198
break;
@@ -325,10 +325,6 @@ export default class extends Controller {
325325
return string.replace(/(<([^>]+)>)/gi, '');
326326
}
327327

328-
#addSlashes(string: string): string {
329-
return string.replace(/["\\]/g, '\\$&');
330-
}
331-
332328
#mergeObjects(object1: any, object2: any): any {
333329
return { ...object1, ...object2 };
334330
}

0 commit comments

Comments
 (0)