update color validator to not use Number.isInteger - PhantomJS workaround

dszymczuk · dszymczuk · commit 738a84fc1cd2 · 2017-08-27T13:24:48.000+02:00
diff --git a/form-validator/color.js b/form-validator/color.js
@@ -1,9 +1,273 @@
-/** File generated by Grunt -- do not modify
- *  JQUERY-FORM-VALIDATOR
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module unless amdModuleId is set
+    define(["jquery"], function (a0) {
+      return (factory(a0));
+    });
+  } else if (typeof module === 'object' && module.exports) {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    module.exports = factory(require("jquery"));
+  } else {
+    factory(root["jQuery"]);
+  }
+}(this, function (jQuery) {
+
+/**
+ * jQuery Form Validator Module: Color
+ * ------------------------------------------
+ * Created by dszymczuk <https://github.com/dszymczuk>
  *
- *  @version 2.3.77
- *  @website http://formvalidator.net/
- *  @author Victor Jonsson, http://victorjonsson.se
- *  @license MIT
+ *
+ * This form validation module adds validators for some color formats like: hex, rgb, rgba, hsl, hsla.
+ * Also it allow to use transparent as color
+ * This module adds the following validators:
+ *  - color
+ *
+ * @license MIT
  */
-!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],function(a){return b(a)}):"object"==typeof module&&module.exports?module.exports=b(require("jquery")):b(a.jQuery)}(this,function(a){!function(a){a.formUtils.registerLoadedModule("color");var b=function(a){return/^(\-|\+)?([0-9]+(\.[0-9]+)?|Infinity)$/.test(a)?Number(a):NaN},c=function(a){return a>0&&a<1};a.formUtils.addValidator({name:"hex",validatorFunction:function(a,b){if("true"===b.valAttr("allow-transparent")&&"transparent"===a)return!0;var c="#"===a[0];if(!c)return!1;var d=4===a.length||7===a.length;if(d){var e=/[0-9a-f]/i,f=a.slice(1).split(""),g=!0;return f.forEach(function(a){null===a.match(e)&&(g=!1)}),g}return!1},errorMessage:"",errorMessageKey:"badHex"}),a.formUtils.addValidator({name:"rgb",validatorFunction:function(a,b){if("true"===b.valAttr("allow-transparent")&&"transparent"===a)return!0;var c=a.replace(/ /g,""),d=/rgb\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3}\)/i;if(c.match(d)){var e=c.replace(/rgb/g,""),f=e.replace(/\(/g,"").replace(/\)/g,""),g=f.split(","),h=!0;return g.forEach(function(a){var b=parseInt(a,10);(Number.isInteger(b)&&0<=b&&b<=255)===!1&&(h=!1)}),h}return!1},errorMessage:"",errorMessageKey:"badRgb"}),a.formUtils.addValidator({name:"rgba",validatorFunction:function(a,d){if("true"===d.valAttr("allow-transparent")&&"transparent"===a)return!0;var e=a.replace(/ /g,""),f=/rgba\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0,1]?.?[0-9]*\)/i;if(e.match(f)){var g=e.replace(/rgba/g,""),h=g.replace(/\(/g,"").replace(/\)/g,""),i=h.split(","),j=!0;return i.forEach(function(a,d){var e=b(a);if(Number.isInteger(e)){var f=e>=0&&e<=255;f||(j=!1),j&&3===d&&(j=e>=0&&e<2)}else c(a)||(j=!1)}),j}return!1},errorMessage:"",errorMessageKey:"badRgba"}),a.formUtils.addValidator({name:"hsl",validatorFunction:function(a,b){if("true"===b.valAttr("allow-transparent")&&"transparent"===a)return!0;var c=a.replace(/ /g,""),d=/hsl\(-?[0-9]{1,3},[0-9]{1,3}%,[0-9]{1,3}%\)/i;if(c.match(d)){var e=c.replace(/hsl/g,""),f=e.replace(/\(/g,"").replace(/\)/g,""),g=f.split(","),h=!0;return g.forEach(function(a,b){var c=parseInt(a,10);if(Number.isInteger(c)){if(0!==b){var d=c>=0&&c<=100;d||(h=!1)}}else h=!1}),h}return!1},errorMessage:"",errorMessageKey:"badHsl"}),a.formUtils.addValidator({name:"hsla",validatorFunction:function(a,c){if("true"===c.valAttr("allow-transparent")&&"transparent"===a)return!0;var d,e=a.replace(/ /g,""),f=/hsla\(-?[0-9]{1,3},[0-9]{1,3}%,[0-9]{1,3}%,[0,1]?.?[0-9]*\)/i;if(e.match(f)){var g=e.replace(/hsla/g,""),h=g.replace(/\(/g,"").replace(/\)/g,""),i=h.split(","),j=!0;return i.forEach(function(a,c){var e=b(a),f=parseInt(a,10);Number.isInteger(e)?(0!==c&&3!==c&&(d=e>=0&&e<=100,d||(j=!1)),j&&3===c&&(j=e>=0&&e<2)):isNaN(e)&&Number.isInteger(f)?(d=f>=0&&f<=100,d||(j=!1)):(e=b(Number(a).toFixed(20)),d=e>=0&&e<=1,d||(j=!1))}),j}return!1},errorMessage:"",errorMessageKey:"badHsla"})}(a)});
+(function($) {
+
+  $.formUtils.registerLoadedModule('color');
+
+  /*
+    HELPER FUNCTIONS
+   */
+  var filterFloat = function(value) {
+    if (/^(\-|\+)?([0-9]+(\.[0-9]+)?|Infinity)$/
+        .test(value)) {
+      return Number(value);
+    }
+
+    return NaN;
+  };
+
+  var isBetween0and1 = function(value) {
+    return value > 0 && value < 1;
+  };
+
+  // workaround for PhantomJS
+  // https://github.com/ariya/phantomjs/issues/14014
+  // can't use Number.isInteger
+  var isInteger = function(value){
+    return Math.floor(value) === value && $.isNumeric(value);
+  };
+
+  /**
+   * Check HEX format
+   */
+  $.formUtils.addValidator({
+    name: 'hex',
+    validatorFunction: function(val, $el) {
+      if ($el.valAttr('allow-transparent') === 'true' && val === 'transparent') {
+        return true;
+      }
+
+      var startWithHex = val[0] === '#';
+      if (!startWithHex) {
+        return false;
+      }
+
+      var isCorrectLength = val.length === 4 || val.length === 7;
+
+      if (isCorrectLength) {
+        var regex = /[0-9a-f]/i;
+        var valueSliced = val.slice(1).split('');
+        var isValid = true;
+        valueSliced.forEach(function(i) {
+          if (i.match(regex) === null) {
+            isValid = false;
+          }
+        });
+        return isValid;
+      }
+
+      return false;
+    },
+    errorMessage: '',
+    errorMessageKey: 'badHex'
+  });
+
+  /**
+   * Check RGB format
+   */
+  $.formUtils.addValidator({
+    name: 'rgb',
+    validatorFunction: function(val, $el) {
+      if ($el.valAttr('allow-transparent') === 'true' && val === 'transparent') {
+        return true;
+      }
+
+      var removedSpace = val.replace(/ /g, '');
+      var regex = /rgb\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3}\)/i;
+
+      if (removedSpace.match(regex)) {
+        var removeRgbCall = removedSpace.replace(/rgb/g, '');
+        var removeBrackets = removeRgbCall.replace(/\(/g, '').replace(/\)/g, '');
+        var valueSliced = removeBrackets.split(',');
+        var isValid = true;
+
+        valueSliced.forEach(function(i) {
+          var parsedInt = parseInt(i, 10);
+          if ((isInteger(parsedInt) && 0 <= parsedInt && parsedInt <= 255) === false) {
+            isValid = false;
+          }
+        });
+        return isValid;
+      }
+
+      return false;
+    },
+    errorMessage: '',
+    errorMessageKey: 'badRgb'
+  });
+
+  /**
+   * Check RGBA format
+   */
+  $.formUtils.addValidator({
+    name: 'rgba',
+    validatorFunction: function(val, $el) {
+      if ($el.valAttr('allow-transparent') === 'true' && val === 'transparent') {
+        return true;
+      }
+
+      var removedSpace = val.replace(/ /g, '');
+      var regex = /rgba\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0,1]?.?[0-9]*\)/i;
+
+      if (removedSpace.match(regex)) {
+        var removeRgbaCall = removedSpace.replace(/rgba/g, '');
+        var removeBrackets = removeRgbaCall.replace(/\(/g, '').replace(/\)/g, '');
+        var valueSliced = removeBrackets.split(',');
+        var isValid = true;
+
+        valueSliced.forEach(function(i, index) {
+          var value = filterFloat(i);
+          if (isInteger(value)) {
+            var isInRange = value >= 0 && value <= 255;
+            if (!isInRange) {
+              isValid = false;
+            }
+
+            if (isValid && index === 3) {
+              isValid = value >= 0 && value < 2;
+            }
+          } else if (!isBetween0and1(i)) {
+            isValid = false;
+          }
+        });
+        return isValid;
+      }
+
+      return false;
+    },
+    errorMessage: '',
+    errorMessageKey: 'badRgba'
+  });
+
+  /**
+   * Check HSL format
+   */
+  $.formUtils.addValidator({
+    name: 'hsl',
+    validatorFunction: function(val, $el) {
+      if ($el.valAttr('allow-transparent') === 'true' && val === 'transparent') {
+        return true;
+      }
+
+      var removedSpace = val.replace(/ /g, '');
+      var regex = /hsl\(-?[0-9]{1,3},[0-9]{1,3}%,[0-9]{1,3}%\)/i;
+
+      if (removedSpace.match(regex)) {
+        var removeHslCall = removedSpace.replace(/hsl/g, '');
+        var removeBrackets = removeHslCall.replace(/\(/g, '').replace(/\)/g, '');
+        var valueSliced = removeBrackets.split(',');
+        var isValid = true;
+
+        valueSliced.forEach(function(i, index) {
+          var parsedInt = parseInt(i, 10);
+
+          if (isInteger(parsedInt)) {
+            if (index !== 0) {
+              var isInRange = parsedInt >= 0 && parsedInt <= 100;
+              if (!isInRange) {
+                isValid = false;
+              }
+            }
+          } else {
+            isValid = false;
+          }
+        });
+        return isValid;
+      }
+
+      return false;
+    },
+    errorMessage: '',
+    errorMessageKey: 'badHsl'
+  });
+
+  /**
+   * Check HSLA format
+   */
+  $.formUtils.addValidator({
+    name: 'hsla',
+    validatorFunction: function(val, $el) {
+      if ($el.valAttr('allow-transparent') === 'true' && val === 'transparent') {
+        return true;
+      }
+
+      var isInRange;
+      var removedSpace = val.replace(/ /g, '');
+      var regex = /hsla\(-?[0-9]{1,3},[0-9]{1,3}%,[0-9]{1,3}%,[0,1]?.?[0-9]*\)/i;
+
+      if (removedSpace.match(regex)) {
+        var removeHslaCall = removedSpace.replace(/hsla/g, '');
+        var removeBrackets = removeHslaCall.replace(/\(/g, '').replace(/\)/g, '');
+        var valueSliced = removeBrackets.split(',');
+        var isValid = true;
+
+        valueSliced.forEach(function(i, index) {
+          var value = filterFloat(i);
+          var parsedInt = parseInt(i, 10);
+
+          if (isInteger(value)) {
+            if (index !== 0 && index !== 3) {
+              isInRange = value >= 0 && value <= 100;
+              if (!isInRange) {
+                isValid = false;
+              }
+            }
+
+            if (isValid && index === 3) {
+              isValid = value >= 0 && value < 2;
+            }
+          } else if (isNaN(value) && isInteger(parsedInt)) {
+            isInRange = parsedInt >= 0 && parsedInt <= 100;
+            if (!isInRange) {
+              isValid = false;
+            }
+          } else {
+            value = filterFloat(Number(i).toFixed(20));
+
+            isInRange = value >= 0 && value <= 1;
+            if (!isInRange) {
+              isValid = false;
+            }
+          }
+        });
+
+        return isValid;
+      }
+
+      return false;
+    },
+    errorMessage: '',
+    errorMessageKey: 'badHsla'
+  });
+
+})(jQuery);
+
+
+}));
diff --git a/src/modules/color.js b/src/modules/color.js
@@ -31,6 +31,13 @@
     return value > 0 && value < 1;
   };
 
+  // workaround for PhantomJS
+  // https://github.com/ariya/phantomjs/issues/14014
+  // can't use Number.isInteger
+  var isInteger = function(value) {
+    return Math.floor(value) === value && $.isNumeric(value);
+  };
+
   /**
    * Check HEX format
    */
@@ -87,7 +94,7 @@
 
         valueSliced.forEach(function(i) {
           var parsedInt = parseInt(i, 10);
-          if ((Number.isInteger(parsedInt) && 0 <= parsedInt && parsedInt <= 255) === false) {
+          if ((isInteger(parsedInt) && 0 <= parsedInt && parsedInt <= 255) === false) {
             isValid = false;
           }
         });
@@ -121,7 +128,7 @@
 
         valueSliced.forEach(function(i, index) {
           var value = filterFloat(i);
-          if (Number.isInteger(value)) {
+          if (isInteger(value)) {
             var isInRange = value >= 0 && value <= 255;
             if (!isInRange) {
               isValid = false;
@@ -165,7 +172,7 @@
         valueSliced.forEach(function(i, index) {
           var parsedInt = parseInt(i, 10);
 
-          if (Number.isInteger(parsedInt)) {
+          if (isInteger(parsedInt)) {
             if (index !== 0) {
               var isInRange = parsedInt >= 0 && parsedInt <= 100;
               if (!isInRange) {
@@ -209,7 +216,7 @@
           var value = filterFloat(i);
           var parsedInt = parseInt(i, 10);
 
-          if (Number.isInteger(value)) {
+          if (isInteger(value)) {
             if (index !== 0 && index !== 3) {
               isInRange = value >= 0 && value <= 100;
               if (!isInRange) {
@@ -220,7 +227,7 @@
             if (isValid && index === 3) {
               isValid = value >= 0 && value < 2;
             }
-          } else if (isNaN(value) && Number.isInteger(parsedInt)) {
+          } else if (isNaN(value) && isInteger(parsedInt)) {
             isInRange = parsedInt >= 0 && parsedInt <= 100;
             if (!isInRange) {
               isValid = false;
