fixed bugs in sanitation module

victorjonsson · victorjonsson · commit 73c8b602196d · 2015-08-19T11:32:27.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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (function($, window) {
 
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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (function($, window) {
 
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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (function($) {
 
diff --git a/form-validator/qunit.html b/form-validator/qunit.html
@@ -682,7 +682,7 @@
         test('Sanitation', function() {
             clearForm();
 
-            var data = {
+            var sanitationTests = {
                 trim : {
                     val : ' apa ',
                     expected : 'apa'
@@ -727,25 +727,41 @@
                         'data-sanitize-insert-left' : 'left...'
                     }
                 },
+                insertRightOmitted : {
+                    val : ' apa $',
+                    expected:  ' apa $',
+                    sanitize : 'insertRight',
+                    attr : {
+                        'data-sanitize-insert-right' : ' $'
+                    }
+                },
+                insertLeftOmitted : {
+                    val : '$ apa $',
+                    expected:  '$ apa $',
+                    sanitize : 'insertRight',
+                    attr : {
+                        'data-sanitize-insert-left' : '$ '
+                    }
+                },
                 'trim insertRight' : {
                     val : ' apa ',
-                    expected:  'aparight...',
+                    expected:  'apa right...',
                     attr : {
-                        'data-sanitize-insert-right' : 'right...'
+                        '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) {
+            $.each(sanitationTests, function(sanitation, data) {
                 var $input = input('hejsan', {'':''}, {name:'test'});
-                $input.attr('data-sanitize', sanitation);
+                $input.attr('data-sanitize', data.sanitize || sanitation);
                 $.each(data.attr || {}, function(attrName, attrVal) {
                     $input.attr(attrName, attrVal);
                 });
-                $.formUtils.setupSanitation($form, $.formUtils.defaultConfig());
+                $.formUtils.setupSanitation({}, $form, $.formUtils.defaultConfig());
                 $input.val(data.val);
                 $input.trigger('blur');
                 equal(
diff --git a/form-validator/sanitize.dev.js b/form-validator/sanitize.dev.js
@@ -22,7 +22,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.2.48
+ * @version 2.2.51
  */
 (function($, window) {
 
@@ -64,15 +64,23 @@
           });
           return words.join(' ');
         },
+        insert : function(val, $input, pos) {
+          var extra = ($input.attr('data-sanitize-insert-'+pos) || '').replace(/\[SPACE\]/g, ' ');
+          if( (pos == 'left' && val.indexOf(extra) == 0) ||
+              (pos == 'right' && val.substring(val.length - extra.length) == extra)) {
+            return val;
+          }
+          return (pos == 'left' ? extra:'') + val + (pos == 'right' ? extra : '');
+        },
         insertRight : function(val, $input) {
-         return val + ($input.attr('data-sanitize-insert-right') || '').replace(/\[SPACE\]/g, ' ');
+          return this.insert(val, $input, 'right');
         },
         insertLeft : function(val, $input) {
-         return ($input.attr('data-sanitize-insert-left') || '').replace(/\[SPACE\]/g, ' ') + val;
+          return this.insert(val, $input, 'left');
         },
         numberFormat : function(val, $input, config) {
           if( 'numeral' in window ) {
-            val = numeral(val).format( $input.attr('data-sanitation-format') );
+            val = numeral(val).format( $input.attr('data-number-format') );
           } else {
             throw new Error('Using sanitation function "numberFormat" requires that you include numeraljs (http://http://numeraljs.com/)');
           }
@@ -97,6 +105,8 @@
         if( !$forms ) {
           $forms = $('form');
         }
+        if( !$forms.each )
+          $forms = $($forms);
 
         var execSanitationCommands = function() {
           var $input = $(this),
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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 (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.48
+ * @version 2.2.51
  */
 $.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.48`
	`13`	`+ * @version 2.2.51`
`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.48`
	`20`	`+ * @version 2.2.51`
`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.48`
	`8`	`+ * @version 2.2.51`
`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.48`
	`10`	`+ * @version 2.2.51`
`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.48`
	`9`	`+ * @version 2.2.51`
`10`	`10`	`*/`
`11`	`11`	`(function($, window) {`
`12`	`12`