MAGETWO-54779: [GitHub] Image size for Product Watermarks can't be set …

…#5270 - modifying js file for simplicity as per code review
magento · Aug 23, 2016 · e4fb73e · e4fb73e
1 parent 952534c
commit e4fb73e
Showing 1 changed file with 3 additions and 17 deletions.
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
@@ -5,39 +5,25 @@
 
 define([
     'jquery',
-    'underscore',
     'Magento_Ui/js/lib/validation/utils',
     'Magento_Ui/js/form/element/abstract',
     'Magento_Ui/js/lib/validation/validator'
-], function ($, _, utils, Abstract, validator) {
+], function ($, utils, Abstract, validator) {
     'use strict';
 
     validator.addRule(
         'validate-image-size-range',
         function (value) {
-            var numValue,
-                dataAttrRange = /^(\d+)x(\d+)?$/,
-                result = false,
+            var dataAttrRange = /^(\d+)x(\d+)$/,
                 m;
 
             if (utils.isEmptyNoTrim(value)) {
                 return true;
             }
-            numValue = utils.parseNumber(value);
-
-            if (isNaN(numValue)) {
-                return false;
-            }
 
             m = dataAttrRange.exec(value);
 
-            if (m) {
-                if (m.length === 3) {
-                    result = m[1] && m[2];
-                }
-            }
-
-            return result;
+            return m && m.length === 3 && m[1] > 0 && m[2] > 0;
         },
         $.mage.__('The value is not within the specified format eg: 200x300')
     );