Skip to content

Commit 001ddca

Browse files
author
Oleksii Korshenko
authored
/FearlessKiwis-MAGETWO-56972-Clone-Watermarks-cant-be-set
Fixed issue: - MAGETWO-56972: CLONE - [GitHub] Image size for Product Watermarks can't be set #5270
2 parents 2765acf + 5a46470 commit 001ddca

File tree

4 files changed

+51
-4
lines changed

4 files changed

+51
-4
lines changed

‎app/code/Magento/Catalog/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,7 @@ Image,Image
700700
"Allowed file types: jpeg, gif, png.","Allowed file types: jpeg, gif, png."
701701
"Image Opacity","Image Opacity"
702702
"Example format: 200x300.","Example format: 200x300."
703+
"This value does not follow the specified format (for example, 200x300).","This value does not follow the specified format (for example, 200x300)."
703704
"Image Position","Image Position"
704705
Small,Small
705706
"Attribute Label","Attribute Label"

‎app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@
5555
<field name="watermark_image_size">
5656
<argument name="data" xsi:type="array">
5757
<item name="config" xsi:type="array">
58+
<item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
5859
<item name="label" xsi:type="string" translate="true">Image Size</item>
5960
<item name="dataType" xsi:type="string">text</item>
6061
<item name="formElement" xsi:type="string">input</item>
6162
<item name="dataScope" xsi:type="string">watermark_image_size</item>
6263
<item name="validation" xsi:type="array">
63-
<item name="validate-digits" xsi:type="boolean">true</item>
64+
<item name="validate-image-size-range" xsi:type="boolean">true</item>
6465
</item>
6566
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
6667
</item>
@@ -118,12 +119,13 @@
118119
<field name="watermark_thumbnail_size">
119120
<argument name="data" xsi:type="array">
120121
<item name="config" xsi:type="array">
122+
<item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
121123
<item name="label" xsi:type="string" translate="true">Image Size</item>
122124
<item name="dataType" xsi:type="string">text</item>
123125
<item name="formElement" xsi:type="string">input</item>
124126
<item name="dataScope" xsi:type="string">watermark_thumbnail_size</item>
125127
<item name="validation" xsi:type="array">
126-
<item name="validate-digits" xsi:type="boolean">true</item>
128+
<item name="validate-image-size-range" xsi:type="boolean">true</item>
127129
</item>
128130
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
129131
</item>
@@ -181,12 +183,13 @@
181183
<field name="watermark_small_image_size">
182184
<argument name="data" xsi:type="array">
183185
<item name="config" xsi:type="array">
186+
<item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
184187
<item name="label" xsi:type="string" translate="true">Image Size</item>
185188
<item name="dataType" xsi:type="string">text</item>
186189
<item name="formElement" xsi:type="string">input</item>
187190
<item name="dataScope" xsi:type="string">watermark_small_image_size</item>
188191
<item name="validation" xsi:type="array">
189-
<item name="validate-digits" xsi:type="boolean">true</item>
192+
<item name="validate-image-size-range" xsi:type="boolean">true</item>
190193
</item>
191194
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
192195
</item>

‎app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* Copyright © 2016 Magento. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
define([
7+
'jquery',
8+
'Magento_Ui/js/lib/validation/utils',
9+
'Magento_Ui/js/form/element/abstract',
10+
'Magento_Ui/js/lib/validation/validator'
11+
], function ($, utils, Abstract, validator) {
12+
'use strict';
13+
14+
validator.addRule(
15+
'validate-image-size-range',
16+
function (value) {
17+
var dataAttrRange = /^(\d+)[Xx](\d+)$/,
18+
m;
19+
20+
if (utils.isEmptyNoTrim(value)) {
21+
return true;
22+
}
23+
24+
m = dataAttrRange.exec(value);
25+
26+
return !!(m && m[1] > 0 && m[2] > 0);
27+
},
28+
$.mage.__('This value does not follow the specified format (for example, 200x300).')
29+
);
30+
31+
return Abstract.extend({
32+
33+
/**
34+
* Checks for relevant value
35+
*
36+
* @returns {Boolean}
37+
*/
38+
isRangeCorrect: function () {
39+
return validator('validate-image-size-range', this.value()).passed;
40+
}
41+
});
42+
});

‎app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@
4848
<field name="watermark_swatch_image_size">
4949
<argument name="data" xsi:type="array">
5050
<item name="config" xsi:type="array">
51+
<item name="component" xsi:type="string">Magento_Catalog/component/image-size-field</item>
5152
<item name="label" xsi:type="string" translate="true">Image Size</item>
5253
<item name="dataType" xsi:type="string">text</item>
5354
<item name="formElement" xsi:type="string">input</item>
5455
<item name="dataScope" xsi:type="string">watermark_swatch_image_size</item>
5556
<item name="validation" xsi:type="array">
56-
<item name="validate-digits" xsi:type="boolean">true</item>
57+
<item name="validate-image-size-range" xsi:type="boolean">true</item>
5758
</item>
5859
<item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
5960
</item>

0 commit comments

Comments
 (0)