Skip to content

EspoCRM – Open Source CRM Application

css.escape usage

Yuri Kuznetsov980b1cc40185
diff --git a/client/src/views/admin/field-manager/fields/options-with-style.js b/client/src/views/admin/field-manager/fields/options-with-style.js
index eef459ff9c..8f64f5e6d2 100644
--- a/client/src/views/admin/field-manager/fields/options-with-style.js
+++ b/client/src/views/admin/field-manager/fields/options-with-style.js
@@ -53,7 +53,7 @@ export default class extends OptionsView {
}
changeStyle(value, style) {
- const val = value.replace(/"/g, '\\"');
+ const val = CSS.escape(value);
this.$el
.find(`[data-action="selectOptionItemStyle"][data-value="${val}"] .check-icon`)
diff --git a/client/src/views/admin/field-manager/fields/options.js b/client/src/views/admin/field-manager/fields/options.js
index 304daba302..b57bea8daf 100644
--- a/client/src/views/admin/field-manager/fields/options.js
+++ b/client/src/views/admin/field-manager/fields/options.js
@@ -112,7 +112,7 @@ export default class FieldManagerOptionsFieldView extends ArrayFieldView {
data.translatedOptions = {};
(data[this.name] || []).forEach(value => {
- const valueInternal = value.replace(/"/g, '\\"');
+ const valueInternal = CSS.escape(value);
const translatedValue = this.$el
.find(`input[data-name="translatedValue"][data-value="${valueInternal}"]`).val() || value;
diff --git a/client/src/views/fields/array-int.js b/client/src/views/fields/array-int.js
index c9ca35bddd..2e8b742aea 100644
--- a/client/src/views/fields/array-int.js
+++ b/client/src/views/fields/array-int.js
@@ -65,11 +65,11 @@ class ArrayIntFieldView extends ArrayFieldView {
return;
}
- let valueInternal = value.toString().replace(/"/g, '\\"');
+ const valueInternal = CSS.escape(value.toString());
this.$list.children('[data-value="' + valueInternal + '"]').remove();
- let index = this.selected.indexOf(value);
+ const index = this.selected.indexOf(value);
this.selected.splice(index, 1);
this.trigger('change');
diff --git a/client/src/views/fields/array.js b/client/src/views/fields/array.js
index 869c65c784..9dc8e544ae 100644
--- a/client/src/views/fields/array.js
+++ b/client/src/views/fields/array.js
@@ -664,6 +664,9 @@ class ArrayFieldView extends BaseFieldView {
.outerHTML;
}
+ /**
+ * @param {string} value
+ */
addValue(value) {
if (this.selected.indexOf(value) === -1) {
const html = this.getItemHtml(value);
@@ -674,8 +677,11 @@ class ArrayFieldView extends BaseFieldView {
}
}
+ /**
+ * @param {string} value
+ */
removeValue(value) {
- const valueInternal = value.replace(/"/g, '\\"');
+ const valueInternal = CSS.escape(value);
this.$list.children('[data-value="' + valueInternal + '"]').remove();
diff --git a/client/src/views/preferences/fields/dashboard-tab-list.js b/client/src/views/preferences/fields/dashboard-tab-list.js
index fa7f855e4b..a5ba0c8533 100644
--- a/client/src/views/preferences/fields/dashboard-tab-list.js
+++ b/client/src/views/preferences/fields/dashboard-tab-list.js
@@ -125,7 +125,7 @@ export default class extends ArrayFieldView {
data.translatedOptions = {};
(data[this.name] || []).forEach(value => {
- const valueInternal = value.replace(/"/g, '\\"');
+ const valueInternal = CSS.escape(value);
data.translatedOptions[value] = this.$el
.find(`input[data-name="translatedValue"][data-value="${valueInternal}"]`)
diff --git a/client/src/views/record/kanban.js b/client/src/views/record/kanban.js
index 9739f90601..86a889b7d7 100644
--- a/client/src/views/record/kanban.js
+++ b/client/src/views/record/kanban.js
@@ -466,7 +466,7 @@ class KanbanRecordView extends ListRecordView {
this.plusElementMap = {};
this.groupDataList.forEach(item => {
- const value = item.name.replace(/"/g, '\\"');
+ const value = CSS.escape(item.name);
this.plusElementMap[item.name] = this.$el.find(`.kanban-head .create-button[data-group="${value}"]`);
});