From 3b53b9285de552f36d12219bd2dc724e94264f41 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Tue, 23 Aug 2016 17:42:16 -0500 Subject: [PATCH 1/4] MAGETWO-56972: CLONE - [GitHub] Image size for Product Watermarks can't be set #5270 - applying changes from MAGETWO-54779 to 2.1 --- app/code/Magento/Catalog/i18n/en_US.csv | 1 + .../ui_component/design_config_form.xml | 9 ++-- .../web/component/image-size-field.js | 42 +++++++++++++++++++ 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv index 0745c98d7169a..a1f1b2e5beb6b 100644 --- a/app/code/Magento/Catalog/i18n/en_US.csv +++ b/app/code/Magento/Catalog/i18n/en_US.csv @@ -700,6 +700,7 @@ Image,Image "Allowed file types: jpeg, gif, png.","Allowed file types: jpeg, gif, png." "Image Opacity","Image Opacity" "Example format: 200x300.","Example format: 200x300." +"This value does not follow the specified format (for example, 200X300).","This value does not follow the specified format (for example, 200X300)." "Image Position","Image Position" Small,Small "Attribute Label","Attribute Label" diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml index dc8ced173bc54..9852ad74121c8 100644 --- a/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml +++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml @@ -55,12 +55,13 @@ + Magento_Catalog/component/image-size-field Image Size text input watermark_image_size - true + true Example format: 200x300. @@ -118,12 +119,13 @@ + Magento_Catalog/component/image-size-field Image Size text input watermark_thumbnail_size - true + true Example format: 200x300. @@ -181,12 +183,13 @@ + Magento_Catalog/component/image-size-field Image Size text input watermark_small_image_size - true + true Example format: 200x300. diff --git a/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js b/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js new file mode 100644 index 0000000000000..b330ccfd8c125 --- /dev/null +++ b/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js @@ -0,0 +1,42 @@ +/** + * Copyright © 2016 Magento. All rights reserved. + * See COPYING.txt for license details. + */ + +define([ + 'jquery', + 'Magento_Ui/js/lib/validation/utils', + 'Magento_Ui/js/form/element/abstract', + 'Magento_Ui/js/lib/validation/validator' +], function ($, utils, Abstract, validator) { + 'use strict'; + + validator.addRule( + 'validate-image-size-range', + function (value) { + var dataAttrRange = /^(\d+)x(\d+)$/, + m; + + if (utils.isEmptyNoTrim(value)) { + return true; + } + + m = dataAttrRange.exec(value); + + return !!(m && m[1] > 0 && m[2] > 0); + }, + $.mage.__('This value does not follow the specified format (for example, 200X300).') + ); + + return Abstract.extend({ + + /** + * Checks for relevant value + * + * @returns {Boolean} + */ + isRangeCorrect: function () { + return validator('validate-image-size-range', this.value()).passed; + } + }); +}); From 849aaecc5eb766b0971592def858a715515ba694 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 24 Aug 2016 17:52:41 -0500 Subject: [PATCH 2/4] MAGETWO-56972: CLONE - [GitHub] Image size for Product Watermarks can't be set #5270 - applying changes from MAGETWO-54779 to 2.1 --- .../view/adminhtml/ui_component/design_config_form.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml index 1b5ec69e5d5c2..0891fb3518376 100644 --- a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml +++ b/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml @@ -48,12 +48,13 @@ + Magento_Catalog/component/image-size-field Image Size text input watermark_swatch_image_size - true + true Example format: 200x300. From 66cb85c3ddb1b46fdb78a56e0d649eef984b54a4 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 31 Aug 2016 14:38:36 -0500 Subject: [PATCH 3/4] MAGETWO-56972: CLONE - [GitHub] Image size for Product Watermarks can't be set #5270 - correcting caps 200X300 to 200x300 for consistency --- app/code/Magento/Catalog/i18n/en_US.csv | 2 +- .../Catalog/view/adminhtml/web/component/image-size-field.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv index a1f1b2e5beb6b..07b408477e1c5 100644 --- a/app/code/Magento/Catalog/i18n/en_US.csv +++ b/app/code/Magento/Catalog/i18n/en_US.csv @@ -700,7 +700,7 @@ Image,Image "Allowed file types: jpeg, gif, png.","Allowed file types: jpeg, gif, png." "Image Opacity","Image Opacity" "Example format: 200x300.","Example format: 200x300." -"This value does not follow the specified format (for example, 200X300).","This value does not follow the specified format (for example, 200X300)." +"This value does not follow the specified format (for example, 200x300).","This value does not follow the specified format (for example, 200x300)." "Image Position","Image Position" Small,Small "Attribute Label","Attribute Label" diff --git a/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js b/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js index b330ccfd8c125..d1d58ed8bbcfd 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js @@ -25,7 +25,7 @@ define([ return !!(m && m[1] > 0 && m[2] > 0); }, - $.mage.__('This value does not follow the specified format (for example, 200X300).') + $.mage.__('This value does not follow the specified format (for example, 200x300).') ); return Abstract.extend({ From 20b383fbd7ee3c5d63fa2ceafd5f6bd9dcecddff Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 31 Aug 2016 16:03:46 -0500 Subject: [PATCH 4/4] MAGETWO-56972: CLONE - [GitHub] Image size for Product Watermarks can't be set #5270 - modifying regex to support both 200X300 to 200x300 --- .../Catalog/view/adminhtml/web/component/image-size-field.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js b/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js index d1d58ed8bbcfd..0cec9623a4f04 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js @@ -14,7 +14,7 @@ define([ validator.addRule( 'validate-image-size-range', function (value) { - var dataAttrRange = /^(\d+)x(\d+)$/, + var dataAttrRange = /^(\d+)[Xx](\d+)$/, m; if (utils.isEmptyNoTrim(value)) {