Added sanitation module victorjonsson#284 and minified portuguese lang victorjonsson#288

victorjonsson · victorjonsson · commit 0c25635dd100 · 2015-08-17T08:48:11.000+02:00
diff --git a/form-validator/date.dev.js b/form-validator/date.dev.js
@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($) {
 
diff --git a/form-validator/file.dev.js b/form-validator/file.dev.js
@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#file-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/form-test.html b/form-validator/form-test.html
@@ -359,6 +359,7 @@ <h2>HTML5 attributes</h2>
             errorMessagePosition : messagePosition,
             scrollToTopOnError : true,
             lang : 'sv',
+            sanitizeAll : 'trim', // only used on form C
            // borderColorOnError : 'purple',
             modules : 'security'+dev+', location'+dev+', sweden'+dev+', file'+dev+', uk'+dev +( xtraModule ? ','+xtraModule:''),
             onModulesLoaded: function() {
@@ -392,7 +393,7 @@ <h2>HTML5 attributes</h2>
 
     window.applyValidation(true, '#form-a', 'top');
     window.applyValidation(false, '#form-b', 'element');
-    window.applyValidation(true, '#form-c', $('#error-container'));
+    window.applyValidation(true, '#form-c', $('#error-container'), 'sanitize'+dev);
     window.applyValidation(true, '#form-d', 'element', 'html5'+dev);
 
     // Load one module outside $.validate() even though you do not have to
diff --git a/form-validator/html5.dev.js b/form-validator/html5.dev.js
@@ -17,7 +17,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/jquery.form-validator.js b/form-validator/jquery.form-validator.js
@@ -5,7 +5,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function ($) {
 
diff --git a/form-validator/jquery.form-validator.min.js b/form-validator/jquery.form-validator.min.js
diff --git a/form-validator/jsconf.dev.js b/form-validator/jsconf.dev.js
@@ -7,7 +7,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($) {
 
diff --git a/form-validator/lang/de.dev.js b/form-validator/lang/de.dev.js
@@ -6,7 +6,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/lang/es.dev.js b/form-validator/lang/es.dev.js
@@ -6,7 +6,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/lang/fr.dev.js b/form-validator/lang/fr.dev.js
@@ -6,7 +6,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/lang/pt.dev.js b/form-validator/lang/pt.dev.js
@@ -6,7 +6,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/lang/pt.js b/form-validator/lang/pt.js
diff --git a/form-validator/lang/sv.dev.js b/form-validator/lang/sv.dev.js
@@ -6,7 +6,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/location.dev.js b/form-validator/location.dev.js
@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($) {
 
diff --git a/form-validator/qunit.html b/form-validator/qunit.html
@@ -679,6 +679,84 @@
              */
         });
 
+        test('Sanitation', function() {
+            clearForm();
+
+            var data = {
+                trim : {
+                    val : ' apa ',
+                    expected : 'apa'
+                },
+                trimLeft : {
+                    val : ' apa ',
+                    expected: 'apa '
+                },
+                trimRight : {
+                    val : ' apa ',
+                    expected:  ' apa'
+                },
+                capitalize : {
+                    val : 'En groda som Önskar sig öl',
+                    expected:  'En Groda Som Önskar Sig Öl'
+                },
+                'capitalize trim' : {
+                    val : ' En groda som Önskar sig öl ',
+                    expected:  'En Groda Som Önskar Sig Öl'
+                },
+                upper : {
+                    val : ' apa ',
+                    expected:  ' APA '
+                },
+                lower : {
+                    val : ' aPA ',
+                    expected:  ' apa '
+                },
+                insertLeft : {
+                    val : ' apa ',
+                    expected:  'left... apa ',
+                    attr : {
+                        'data-sanitize-insert-right' : 'right...',
+                        'data-sanitize-insert-left' : 'left...'
+                    }
+                },
+                insertRight : {
+                    val : ' apa ',
+                    expected:  ' apa right...',
+                    attr : {
+                        'data-sanitize-insert-right' : 'right...',
+                        'data-sanitize-insert-left' : 'left...'
+                    }
+                },
+                'trim insertRight' : {
+                    val : ' apa ',
+                    expected:  'aparight...',
+                    attr : {
+                        'data-sanitize-insert-right' : 'right...'
+                    }
+                },
+                escape : {
+                    val : '<p style="color: pink">hejsan & så\' vidare</p>',
+                    expected:  '&lt;p style=&quot;color: pink&quot;&gt;hejsan &amp; så&#8217; vidare&lt;/p&gt;'                }
+            };
+
+            $.each(data, function(sanitation, data) {
+                var $input = input('hejsan', {'':''}, {name:'test'});
+                $input.attr('data-sanitize', sanitation);
+                $.each(data.attr || {}, function(attrName, attrVal) {
+                    $input.attr(attrName, attrVal);
+                });
+                $.formUtils.setupSanitation($form, $.formUtils.defaultConfig());
+                $input.val(data.val);
+                $input.trigger('blur');
+                equal(
+                    $input.val(),
+                    data.expected,
+                    'Sanitize with "'+sanitation+'"'
+                );
+            });
+
+        });
+
         test('Confirmation', function() {
 
             clearForm();
@@ -730,7 +808,7 @@
     var dev = window.location.hash.indexOf('dev') > -1 ? '.dev' : '';
 
     $.validate({
-        modules : 'security'+dev+', location'+dev+', sweden'+dev+', file'+dev+', date'+dev+', uk'+dev,
+        modules : 'security'+dev+', location'+dev+', sweden'+dev+', file'+dev+', date'+dev+', sanitize'+dev+', uk'+dev,
         onModulesLoaded: function( $form ) {
             if( window.console && window.console.log )
                 console.log('About to run all tests');
diff --git a/form-validator/sanitize.dev.js b/form-validator/sanitize.dev.js
@@ -0,0 +1,131 @@
+/**
+ * jQuery Form Validator Module: sanitize
+ * ------------------------------------------
+ * Created by Victor Jonsson <http://www.victorjonsson.se>
+ *
+ * This module makes it possible to add sanitation functions to
+ * inputs. The functions is triggered on blur. Example:
+ *
+ * <input data-sanitize="uppercase trim" />
+ *
+ * Available functions are:
+ *  - uppercase
+ *  - lowercase
+ *  - capitalize
+ *  - trim
+ *  - trimLeft
+ *  - trimRight
+ *  - numberFormat
+ *  - insertLeft
+ *  - insertRight
+ *  - escape (replace <, >, &, ' and " with HTML entities)
+ *
+ * @website http://formvalidator.net/
+ * @license Dual licensed under the MIT or GPL Version 2 licenses
+ * @version 2.2.48
+ */
+(function($, window) {
+
+  "use strict";
+
+  var inputsThatCantBeSanitized = '[type="button"], [type="submit"], [type="radio"], [type="checkbox"], [type="reset"], [type="search"]',
+      splitStringInHalf = function(str) {
+        var firstHalf = Math.floor(str.length / 2);
+        return [str.substr(0, firstHalf), str.substr(firstHalf, str.length - firstHalf)];
+      },
+      sanitizeCommands = {
+        upper : function(val) {
+          return val.toLocaleUpperCase();
+        },
+        lower : function(val) {
+          return val.toLocaleLowerCase();
+        },
+        trim : function(val) {
+          return $.trim(val);
+        },
+        trimLeft : function(val) {
+          if( val.length > 1 ) {
+            var parts = splitStringInHalf(val);
+            val = $.trim(parts[0]) + parts[1];
+          }
+          return val;
+        },
+        trimRight : function(val) {
+          if( val.length > 1 ) {
+            var parts = splitStringInHalf(val);
+            val = parts[0] + $.trim(parts[1]);
+          }
+          return val;
+        },
+        capitalize : function(val) {
+          var words = val.split(' ');
+          $.each(words, function(i, word) {
+            words[i] = word.substr(0,1).toUpperCase() + word.substr(1, word.length);
+          });
+          return words.join(' ');
+        },
+        insertRight : function(val, $input) {
+         return val + ($input.attr('data-sanitize-insert-right') || '').replace(/\[SPACE\]/g, ' ');
+        },
+        insertLeft : function(val, $input) {
+         return ($input.attr('data-sanitize-insert-left') || '').replace(/\[SPACE\]/g, ' ') + val;
+        },
+        numberFormat : function(val, $input, config) {
+          if( 'numeral' in window ) {
+            val = numeral(val).format( $input.attr('data-sanitation-format') );
+          } else {
+            throw new Error('Using sanitation function "numberFormat" requires that you include numeraljs (http://http://numeraljs.com/)');
+          }
+          return val;
+        },
+        escape : function(val) {
+          var symbols = {
+            '<' : '__%AMP%__lt;',
+            '>' : '__%AMP%__gt;',
+            '&' : '__%AMP%__amp;',
+            '\'': '__%AMP%__#8217;',
+            '"' : '__%AMP%__quot;'
+          };
+          $.each(symbols, function(symbol, replacement) {
+            val = val.replace(new RegExp(symbol, 'g'), replacement);
+          });
+          return val.replace(new RegExp('__\%AMP\%__', 'g'), '&');
+        }
+      },
+      setupSanitation = function(evt, $forms, config) {
+
+        if( !$forms ) {
+          $forms = $('form');
+        }
+
+        var execSanitationCommands = function() {
+          var $input = $(this),
+            value = $input.val();
+          $.split($input.attr('data-sanitize'), function(command) {
+            if( command in sanitizeCommands )
+              value = sanitizeCommands[command](value, $input, config);
+            else
+              throw new Error('Use of unknown sanitize command "'+command+'"');
+          });
+          $input.val(value);
+        };
+        
+        $forms.each(function() {
+          var $form = $(this);
+          if( config.sanitizeAll ) {
+            $form.find('input,textarea').not(inputsThatCantBeSanitized).attr('data-sanitize', config.sanitizeAll);
+          }
+
+          $form.find('[data-sanitize]')
+            .unbind('blur', execSanitationCommands)
+            .bind('blur', execSanitationCommands);
+
+        });
+      };
+
+  $(window).on('validatorsLoaded formValidationSetup', setupSanitation);
+
+  // Only for unit testing
+  $.formUtils.setupSanitation = setupSanitation;
+
+})(jQuery, window);
diff --git a/form-validator/sanitize.js b/form-validator/sanitize.js
diff --git a/form-validator/security.dev.js b/form-validator/security.dev.js
@@ -13,7 +13,7 @@
  *  - cvv
  *
  * @website http://formvalidator.net/#security-validators
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/sweden.dev.js b/form-validator/sweden.dev.js
@@ -13,7 +13,7 @@
  *
  * @website http://formvalidator.net/#swedish-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window) {
 
diff --git a/form-validator/theme-default.css b/form-validator/theme-default.css
diff --git a/form-validator/toggleDisabled.dev.js b/form-validator/toggleDisabled.dev.js
@@ -8,7 +8,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 (function($, window, undefined) {
 
diff --git a/form-validator/uk.dev.js b/form-validator/uk.dev.js
@@ -9,7 +9,7 @@
  *
  * @website http://formvalidator.net/#uk-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.43
+ * @version 2.2.48
  */
 $.formUtils.addValidator({
     name : 'ukvatnumber',

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* @website http://formvalidator.net/#location-validators`
`12`	`12`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`13`		`- * @version 2.2.43`
	`13`	`+ * @version 2.2.48`
`14`	`14`	`*/`
`15`	`15`	`(function($) {`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`* @website http://formvalidator.net/`
`19`	`19`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`20`		`- * @version 2.2.43`
	`20`	`+ * @version 2.2.48`
`21`	`21`	`*/`
`22`	`22`	`(function($, window) {`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* @website http://formvalidator.net/`
`7`	`7`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`8`		`- * @version 2.2.43`
	`8`	`+ * @version 2.2.48`
`9`	`9`	`*/`
`10`	`10`	`(function ($) {`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* @website http://formvalidator.net/#location-validators`
`9`	`9`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`10`		`- * @version 2.2.43`
	`10`	`+ * @version 2.2.48`
`11`	`11`	`*/`
`12`	`12`	`(function($) {`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* @website http://formvalidator.net/`
`8`	`8`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`9`		`- * @version 2.2.43`
	`9`	`+ * @version 2.2.48`
`10`	`10`	`*/`
`11`	`11`	`(function($, window) {`
`12`	`12`