victorjonsson#381 Dont escape already escaped values

Author: victorjonsson

form-validator/brazil.js

@@ -17,7 +17,7 @@
 /** File generated by Grunt -- do not modify
  *  JQUERY-FORM-VALIDATOR
  *
- *  @version 2.2.203
+ *  @version 2.2.205
  *  @website http://formvalidator.net/
  *  @author Victor Jonsson, http://victorjonsson.se
  *  @license MIT
@@ -323,7 +323,7 @@
 /**
  * File declaring all methods if this plugin which is applied to $.fn.
  */
-(function($, window) {
+(function($, window, undefined) {
 
   'use strict';
 
@@ -1083,6 +1083,9 @@
 
   $.formUtils = $.extend($.formUtils || {}, {
 
+    tabKey: 9,
+    shiftKey: 16,
+
     $win: $win,
 
     /**

form-validator/date.js

@@ -1,7 +1,7 @@
 /** File generated by Grunt -- do not modify
  *  JQUERY-FORM-VALIDATOR
  *
- *  @version 2.2.203
+ *  @version 2.2.205
  *  @website http://formvalidator.net/
  *  @author Victor Jonsson, http://victorjonsson.se
  *  @license MIT

form-validator/file.js

@@ -7,7 +7,7 @@
         "validation",
         "validator"
     ],
-    "version": "2.2.203",
+    "version": "2.2.205",
     "author": {
         "name": "Victor Jonsson",
         "url": "http://victorjonsson.se",

form-validator/html5.js

@@ -1,7 +1,7 @@
 {
   "name": "jquery-form-validator",
   "description": "With this feature rich jQuery plugin it becomes easy to validate user input while keeping your HTML markup clean from javascript code. Even though this plugin has a wide range of validation functions it's designed to require as little bandwidth as possible. This is achieved by grouping together validation functions in \"modules\", making it possible for the programmer to load only those functions that's needed to validate a particular form.",
-  "version": "2.2.203",
+  "version": "2.2.205",
   "main": "./form-validator/jquery.form-validator.min.js",
   "keywords": [
     "form",

form-validator/jquery.form-validator.js

@@ -1,7 +1,7 @@
 /**
  * File declaring all methods if this plugin which is applied to $.fn.
  */
-(function($, window) {
+(function($, window, undefined) {
 
   'use strict';
 

form-validator/jquery.form-validator.min.js

@@ -9,6 +9,9 @@
 
   $.formUtils = $.extend($.formUtils || {}, {
 
+    tabKey: 9,
+    shiftKey: 16,
+
     $win: $win,
 
     /**

form-validator/jsconf.js

@@ -88,17 +88,31 @@
           });
           return val;
         },
-        escape : function(val) {
-          var symbols = {
-            '<' : '__%AMP%__lt;',
-            '>' : '__%AMP%__gt;',
-            '&' : '__%AMP%__amp;',
-            '\'': '__%AMP%__#8217;',
-            '"' : '__%AMP%__quot;'
-          };
-          $.each(symbols, function(symbol, replacement) {
+        escape : function(val, $input) {
+          var isEscaped = $input.valAttr('is-escaped'),
+            entities = {
+              '<' : '__%AMP%__lt;',
+              '>' : '__%AMP%__gt;',
+              '&' : '__%AMP%__amp;',
+              '\'': '__%AMP%__#8217;',
+              '"' : '__%AMP%__quot;'
+            };
+
+          if (isEscaped === 'yes') {
+             return val;
+          }
+
+          $input.valAttr('is-escaped', 'yes');
+          $input.one('keyup', function(evt) {
+            if( evt.keyCode !== $.formUtils.tabKey ) {
+              $input.valAttr('is-escaped', 'no');
+            }
+          });
+
+          $.each(entities, function(symbol, replacement) {
             val = val.replace(new RegExp(symbol, 'g'), replacement);
           });
+
           return val.replace(new RegExp('__\%AMP\%__', 'g'), '&');
         }
       },

form-validator/lang/cz.js

@@ -833,11 +833,11 @@
                     attr: {
                         'data-sanitize-strip' : '$, @'
                     }
-                }, /* This functionality doesn't work correctly. See issue #381
+                },
                 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;'
-                }, */
+                },
                 basicNumberFormat1: {
                     val: '-8000.00',
                     expected: '-8,000.0',