Browse Source

Merge branch 'dev' into 2.x

Conflicts:
	js/jquery.inputmask.js
Robin Herbots 13 years ago
parent
commit
1587d96ef5
1 changed files with 1 additions and 2 deletions
  1. 1 2
      js/jquery.inputmask.js

+ 1 - 2
js/jquery.inputmask.js

@@ -300,7 +300,6 @@
                 }
                 }
 
 
                 generateMask("", opts.mask);
                 generateMask("", opts.mask);
-
                 return ms;
                 return ms;
             }
             }
 
 
@@ -352,7 +351,7 @@
 
 
                 determineActiveMasksetIndex(buffer, pos, currentActiveMasksetIndex, isRTL);
                 determineActiveMasksetIndex(buffer, pos, currentActiveMasksetIndex, isRTL);
                 result = results[activeMasksetIndex] || result;
                 result = results[activeMasksetIndex] || result;
-                setTimeout(opts.onKeyValidation.call(this, result, opts), 0); //extra stuff to execute on keydown
+                setTimeout(function () { opts.onKeyValidation.call(this, result, opts); }, 0); //extra stuff to execute on keydown
                 return result;
                 return result;
             }
             }