Skip to content

Commit c42fb6b

Browse files
committed
MAGETWO-45051: Default swatch is not selected automatically
1 parent acd35f4 commit c42fb6b

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ define([
4141
if (!data.intype) {
4242
data.intype = optionDefaultInputType;
4343
}
44+
45+
if (!this.totalItems) {
46+
data.checked = 'checked';
47+
}
4448
element = this.template({
4549
data: data
4650
});

app/code/Magento/Swatches/view/adminhtml/web/js/text.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ define([
4040
data.intype = swatchOptionTextDefaultInputType;
4141
}
4242

43+
if (!this.totalItems) {
44+
data.checked = 'checked';
45+
}
4346
element = this.template({
4447
data: data
4548
});
@@ -110,7 +113,6 @@ define([
110113

111114
if (from === arrayLength) {
112115
this.updateItemsCountField();
113-
this.bindRemoveButtons();
114116
this.rendered = 1;
115117
jQuery('body').trigger('processStop');
116118

app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ define([
4242
if (!data.intype) {
4343
data.intype = swatchOptionVisualDefaultInputType;
4444
}
45+
46+
if (!this.totalItems) {
47+
data.checked = 'checked';
48+
}
4549
element = this.template({
4650
data: data
4751
});

lib/web/mage/validation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@
12421242
'required-swatch-entry': [
12431243
function (value, element) {
12441244
var empty = $(element).closest('table')
1245-
.find('input.required-option')
1245+
.find('input.required-option:visible')
12461246
.filter(function(i, el){
12471247
return $.mage.isEmpty(el.value);
12481248
})

0 commit comments

Comments
 (0)