Skip to content

Commit 0835f9d

Browse files
committed
MC-16608: Use escaper methods
- clean up code
1 parent f9b8b8f commit 0835f9d

File tree

1 file changed

+24
-10
lines changed
  • app/code/Magento/Config/view/adminhtml/templates/system/config

1 file changed

+24
-10
lines changed

app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,36 +143,50 @@ originModel.prototype = {
143143
var value = this.regionElement.value;
144144
var disabled = this.regionElement.disabled;
145145
if (data.length) {
146-
var html = '<select name="'+this.regionElement.name+'" id="'+this.regionElement.id+'" ' +
147-
'class="required-entry select" title="'+this.regionElement.title+'"'+(disabled?" disabled":"")+'>';
146+
var select = document.createElement('select');
147+
select.setAttribute('name', this.regionElement.name);
148+
select.setAttribute('title', this.regionElement.title);
149+
select.setAttribute('id', this.regionElement.id);
150+
select.setAttribute('class', 'required-entry select');
151+
if (disabled) {
152+
select.setAttribute('disabled', '');
153+
}
148154
for (var i in data) {
149155
if (data[i].label) {
150-
html+= '<option value="'+data[i].value+'"';
156+
var option = document.createElement('option');
157+
option.setAttribute('value', data[i].value);
158+
option.innerText = data[i].label;
151159
if (this.regionElement.value &&
152160
(this.regionElement.value == data[i].value || this.regionElement.value == data[i].label)
153161
) {
154-
html+= ' selected';
162+
option.setAttribute('selected', '');
155163
}
156-
html+='>'+data[i].label+'<\/option>';
164+
select.add(option);
157165
}
158166
}
159-
html+= '<\/select>';
160167

161168
var parentNode = this.regionElement.parentNode;
162169
var regionElementId = this.regionElement.id;
163-
parentNode.innerHTML = html;
170+
parentNode.innerHTML = select.outerHTML;
171+
164172
this.regionElement = $(regionElementId);
165173
} else if (this.reload) {
166174
this.clearRegionField(disabled);
167175
}
168176
}
169177
},
170178
clearRegionField: function(disabled) {
171-
var html = '<input type="text" name="' + this.regionElement.name + '" id="' + this.regionElement.id + '" ' +
172-
'class="input-text" title="' + this.regionElement.title + '"' + (disabled ? " disabled" : "") + '>';
179+
var text = document.createElement('text');
180+
text.setAttribute('name', this.regionElement.name);
181+
text.setAttribute('title', this.regionElement.title);
182+
text.setAttribute('id', this.regionElement.id);
183+
text.setAttribute('class', 'input-text');
184+
if (disabled) {
185+
text.setAttribute('disabled', '');
186+
}
173187
var parentNode = this.regionElement.parentNode;
174188
var regionElementId = this.regionElement.id;
175-
parentNode.innerHTML = html;
189+
parentNode.innerHTML = text.outerHTML;
176190
this.regionElement = $(regionElementId);
177191
}
178192
}

0 commit comments

Comments
 (0)