Browse Source

fix possible _valueGet undefined on submit

Robin Herbots 11 years ago
parent
commit
197265d9d6

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.1.6",
+  "version": "3.1.8",
   "main": [
     "./dist/inputmask/jquery.inputmask.js",
     "./dist/inputmask/jquery.inputmask.extensions.js",

+ 1 - 1
build.properties

@@ -7,7 +7,7 @@ distdir = dist
 
 build.major = 3
 build.minor = 1
-build.revision = 6
+build.revision = 8
 
 target = jquery.inputmask.bundle.js
 target.min = jquery.inputmask.bundle.min.js

File diff suppressed because it is too large
+ 63 - 63
dist/inputmask/jquery.inputmask.js


+ 19 - 13
dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2014 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.6
+* Version: 3.1.8
 */
 
 (function (factory) {
@@ -1029,8 +1029,11 @@
             }
             function clearOptionalTail(input) {
                 var buffer = getBuffer(), tmpBuffer = buffer.slice();
-                var rl = determineLastRequiredPosition();
-                tmpBuffer.length = rl;
+                var rl = determineLastRequiredPosition(), lmib = tmpBuffer.length - 1;
+                for (; lmib > rl; lmib--) {
+                    if (isMask(lmib)) break;
+                }
+                tmpBuffer.splice(rl, lmib + 1 - rl);
                 writeBuffer(input, tmpBuffer);
             }
             function isComplete(buffer) { //return true / false / undefined (repeat *)
@@ -1513,11 +1516,11 @@
                     $el.unbind(".inputmask");
                     $el.removeClass('focus-inputmask');
                     //bind events
-                    $el.closest('form').bind("submit", function () { //trigger change on submit if any
+                    $el.closest('form').bind("submit", function (e) { //trigger change on submit if any
                         if (valueOnFocus != getBuffer().join('')) {
                             $el.change();
                         }
-                        if ($el[0]._valueGet() == getBufferTemplate().join('')) {
+                        if ($el[0]._valueGet && $el[0]._valueGet() == getBufferTemplate().join('')) {
                             $el[0]._valueSet(''); //clear masktemplete on submit and still has focus
                         }
                         if (opts.autoUnmask && opts.removeMaskOnSubmit) {
@@ -1720,8 +1723,11 @@
                         var valueBuffer = actionObj["value"].split('');
                         checkVal($el, false, true, isRTL ? valueBuffer.reverse() : valueBuffer);
                         var buffer = getBuffer();
-                        var rl = determineLastRequiredPosition();
-                        buffer.length = rl;
+                        var rl = determineLastRequiredPosition(), lmib = buffer.length - 1;
+                        for (; lmib > rl; lmib--) {
+                            if (isMask(lmib)) break;
+                        }
+                        buffer.splice(rl, lmib + 1 - rl);
 
                         return isComplete(buffer) && actionObj["value"] == buffer.join('');
                     case "getemptymask":
@@ -1851,7 +1857,7 @@
                     ALT: 18, BACKSPACE: 8, CAPS_LOCK: 20, COMMA: 188, COMMAND: 91, COMMAND_LEFT: 91, COMMAND_RIGHT: 93, CONTROL: 17, DELETE: 46, DOWN: 40, END: 35, ENTER: 13, ESCAPE: 27, HOME: 36, INSERT: 45, LEFT: 37, MENU: 93, NUMPAD_ADD: 107, NUMPAD_DECIMAL: 110, NUMPAD_DIVIDE: 111, NUMPAD_ENTER: 108,
                     NUMPAD_MULTIPLY: 106, NUMPAD_SUBTRACT: 109, PAGE_DOWN: 34, PAGE_UP: 33, PERIOD: 190, RIGHT: 39, SHIFT: 16, SPACE: 32, TAB: 9, UP: 38, WINDOWS: 91
                 },
-                //specify keycodes which should not be considered in the keypress event, otherwise the preventDefault will stop their default behavior especially in FF
+                //specify $.keyCodes which should not be considered in the keypress event, otherwise the preventDefault will stop their default behavior especially in FF
                 ignorables: [8, 9, 13, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40, 45, 46, 93, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123],
                 isComplete: undefined //override for isComplete - args => buffer, opts - return true || false
             },
@@ -1984,7 +1990,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.1.6
+Version: 3.1.8
 
 Optional extensions on the jquery.inputmask base
 */
@@ -2112,7 +2118,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.1.6
+Version: 3.1.8
 
 Optional extensions on the jquery.inputmask base
 */
@@ -2608,7 +2614,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.1.6
+Version: 3.1.8
 
 Optional extensions on the jquery.inputmask base
 */
@@ -2868,7 +2874,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.1.6
+Version: 3.1.8
 
 Regex extensions on the jquery.inputmask base
 Allows for using regular expressions as a mask
@@ -3062,7 +3068,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.1.6
+Version: 3.1.8
 
 Phone extension.
 When using this extension make sure you specify the correct url to get the masks

File diff suppressed because it is too large
+ 59 - 59
dist/jquery.inputmask.bundle.min.js


+ 1 - 1
jquery.inputmask.jquery.json

@@ -8,7 +8,7 @@
 		"inputmask",
 		"mask"
     ],
-    "version": "3.1.6",
+    "version": "3.1.8",
     "author": {
         "name": "Robin Herbots",
         "url": "http://github.com/RobinHerbots/jquery.inputmask"

+ 13 - 7
js/jquery.inputmask.js

@@ -1029,8 +1029,11 @@
             }
             function clearOptionalTail(input) {
                 var buffer = getBuffer(), tmpBuffer = buffer.slice();
-                var rl = determineLastRequiredPosition();
-                tmpBuffer.length = rl;
+                var rl = determineLastRequiredPosition(), lmib = tmpBuffer.length - 1;
+                for (; lmib > rl; lmib--) {
+                    if (isMask(lmib)) break;
+                }
+                tmpBuffer.splice(rl, lmib + 1 - rl);
                 writeBuffer(input, tmpBuffer);
             }
             function isComplete(buffer) { //return true / false / undefined (repeat *)
@@ -1513,11 +1516,11 @@
                     $el.unbind(".inputmask");
                     $el.removeClass('focus-inputmask');
                     //bind events
-                    $el.closest('form').bind("submit", function () { //trigger change on submit if any
+                    $el.closest('form').bind("submit", function (e) { //trigger change on submit if any
                         if (valueOnFocus != getBuffer().join('')) {
                             $el.change();
                         }
-                        if ($el[0]._valueGet() == getBufferTemplate().join('')) {
+                        if ($el[0]._valueGet && $el[0]._valueGet() == getBufferTemplate().join('')) {
                             $el[0]._valueSet(''); //clear masktemplete on submit and still has focus
                         }
                         if (opts.autoUnmask && opts.removeMaskOnSubmit) {
@@ -1720,8 +1723,11 @@
                         var valueBuffer = actionObj["value"].split('');
                         checkVal($el, false, true, isRTL ? valueBuffer.reverse() : valueBuffer);
                         var buffer = getBuffer();
-                        var rl = determineLastRequiredPosition();
-                        buffer.length = rl;
+                        var rl = determineLastRequiredPosition(), lmib = buffer.length - 1;
+                        for (; lmib > rl; lmib--) {
+                            if (isMask(lmib)) break;
+                        }
+                        buffer.splice(rl, lmib + 1 - rl);
 
                         return isComplete(buffer) && actionObj["value"] == buffer.join('');
                     case "getemptymask":
@@ -1851,7 +1857,7 @@
                     ALT: 18, BACKSPACE: 8, CAPS_LOCK: 20, COMMA: 188, COMMAND: 91, COMMAND_LEFT: 91, COMMAND_RIGHT: 93, CONTROL: 17, DELETE: 46, DOWN: 40, END: 35, ENTER: 13, ESCAPE: 27, HOME: 36, INSERT: 45, LEFT: 37, MENU: 93, NUMPAD_ADD: 107, NUMPAD_DECIMAL: 110, NUMPAD_DIVIDE: 111, NUMPAD_ENTER: 108,
                     NUMPAD_MULTIPLY: 106, NUMPAD_SUBTRACT: 109, PAGE_DOWN: 34, PAGE_UP: 33, PERIOD: 190, RIGHT: 39, SHIFT: 16, SPACE: 32, TAB: 9, UP: 38, WINDOWS: 91
                 },
-                //specify keycodes which should not be considered in the keypress event, otherwise the preventDefault will stop their default behavior especially in FF
+                //specify $.keyCodes which should not be considered in the keypress event, otherwise the preventDefault will stop their default behavior especially in FF
                 ignorables: [8, 9, 13, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40, 45, 46, 93, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123],
                 isComplete: undefined //override for isComplete - args => buffer, opts - return true || false
             },

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.1.6",
+  "version": "3.1.8",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
   "main": [
     "./dist/inputmask/jquery.inputmask.js",

+ 87 - 86
qunit/simulator.js

@@ -1,97 +1,98 @@
-var keyCodes = {
-    ALT: 18, BACKSPACE: 8, CAPS_LOCK: 20, COMMA: 188, COMMAND: 91, COMMAND_LEFT: 91, COMMAND_RIGHT: 93, CONTROL: 17, DELETE: 46, DOWN: 40, END: 35, ENTER: 13, ESCAPE: 27, HOME: 36, INSERT: 45, LEFT: 37, MENU: 93, NUMPAD_ADD: 107, NUMPAD_DECIMAL: 110, NUMPAD_DIVIDE: 111, NUMPAD_ENTER: 108,
-    NUMPAD_MULTIPLY: 106, NUMPAD_SUBTRACT: 109, PAGE_DOWN: 34, PAGE_UP: 33, PERIOD: 190, RIGHT: 39, SHIFT: 16, SPACE: 32, TAB: 9, UP: 38, WINDOWS: 91
-}
-function caret(input, begin, end) {
-    var npt = input.jquery && input.length > 0 ? input[0] : input, range;
-    if (typeof begin == 'number') {
-        if (!$(input).is(':visible')) {
-            return;
-        }
-        end = (typeof end == 'number') ? end : begin;
-        if (npt.setSelectionRange) {
-            npt.selectionStart = begin;
-            npt.selectionEnd = end;
-
-        } else if (npt.createTextRange) {
-            range = npt.createTextRange();
-            range.collapse(true);
-            range.moveEnd('character', end);
-            range.moveStart('character', begin);
-            range.select();
-        }
-    } else {
-        if (!$(input).is(':visible')) {
-            return { "begin": 0, "end": 0 };
-        }
-        if (npt.setSelectionRange) {
-            begin = npt.selectionStart;
-            end = npt.selectionEnd;
-        } else if (document.selection && document.selection.createRange) {
-            range = document.selection.createRange();
-            begin = 0 - range.duplicate().moveStart('character', -100000);
-            end = begin + range.text.length;
-        }
-        return { "begin": begin, "end": end };
-    }
-};
-$.fn.SendKey = function (keyCode, modifier) {
-    var sendDummyKeydown = false;
-    if (Object.prototype.toString.call(keyCode) == '[object String]') {
-        keyCode = keyCode.charCodeAt(0);
-        sendDummyKeydown = true;
+(function ($) {
+    $.keyCodes = {
+        ALT: 18, BACKSPACE: 8, CAPS_LOCK: 20, COMMA: 188, COMMAND: 91, COMMAND_LEFT: 91, COMMAND_RIGHT: 93, CONTROL: 17, DELETE: 46, DOWN: 40, END: 35, ENTER: 13, ESCAPE: 27, HOME: 36, INSERT: 45, LEFT: 37, MENU: 93, NUMPAD_ADD: 107, NUMPAD_DECIMAL: 110, NUMPAD_DIVIDE: 111, NUMPAD_ENTER: 108,
+        NUMPAD_MULTIPLY: 106, NUMPAD_SUBTRACT: 109, PAGE_DOWN: 34, PAGE_UP: 33, PERIOD: 190, RIGHT: 39, SHIFT: 16, SPACE: 32, TAB: 9, UP: 38, WINDOWS: 91
     }
+    $.caret = function (input, begin, end) {
+        var npt = input.jquery && input.length > 0 ? input[0] : input, range;
+        if (typeof begin == 'number') {
+            if (!$(input).is(':visible')) {
+                return;
+            }
+            end = (typeof end == 'number') ? end : begin;
+            if (npt.setSelectionRange) {
+                npt.selectionStart = begin;
+                npt.selectionEnd = end;
 
-    switch (keyCode) {
-        case keyCodes.LEFT: {
-            if (modifier == undefined) {
-                var pos = caret(this);
-                caret(this, pos.begin - 1);
-                break;
+            } else if (npt.createTextRange) {
+                range = npt.createTextRange();
+                range.collapse(true);
+                range.moveEnd('character', end);
+                range.moveStart('character', begin);
+                range.select();
             }
-        }
-        case keyCodes.RIGHT: {
-            if (modifier == undefined) {
-                var pos = caret(this);
-                caret(this, pos.begin + 1);
-                break;
+        } else {
+            if (!$(input).is(':visible')) {
+                return { "begin": 0, "end": 0 };
+            }
+            if (npt.setSelectionRange) {
+                begin = npt.selectionStart;
+                end = npt.selectionEnd;
+            } else if (document.selection && document.selection.createRange) {
+                range = document.selection.createRange();
+                begin = 0 - range.duplicate().moveStart('character', -100000);
+                end = begin + range.text.length;
             }
+            return { "begin": begin, "end": end };
+        }
+    };
+    $.fn.SendKey = function (keyCode, modifier) {
+        var sendDummyKeydown = false;
+        if (Object.prototype.toString.call(keyCode) == '[object String]') {
+            keyCode = keyCode.charCodeAt(0);
+            sendDummyKeydown = true;
         }
-        default: {
-            var keydown = $.Event("keydown"),
-                keypress = $.Event("keypress"),
-                keyup = $.Event("keyup");
 
-            if (!sendDummyKeydown) {
-                keydown.keyCode = keyCode;
-                if (modifier == keyCodes.CONTROL)
-                    keydown.ctrlKey = true;
+        switch (keyCode) {
+            case $.keyCodes.LEFT: {
+                if (modifier == undefined) {
+                    var pos = $.caret(this);
+                    $.caret(this, pos.begin - 1);
+                    break;
+                }
             }
-            $(this).trigger(keydown);
-            if (!keydown.isDefaultPrevented()) {
-                keypress.keyCode = keyCode;
-                if (modifier == keyCodes.CONTROL)
-                    keypress.ctrlKey = true;
-                $(this).trigger(keypress);
-                if (!keypress.isDefaultPrevented()) {
-                    keyup.keyCode = keyCode;
-                    if (modifier == keyCodes.CONTROL)
-                        keyup.ctrlKey = true;
-                    $(this).trigger(keyup);
+            case $.keyCodes.RIGHT: {
+                if (modifier == undefined) {
+                    var pos = $.caret(this);
+                    $.caret(this, pos.begin + 1);
+                    break;
+                }
+            }
+            default: {
+                var keydown = $.Event("keydown"),
+                    keypress = $.Event("keypress"),
+                    keyup = $.Event("keyup");
+
+                if (!sendDummyKeydown) {
+                    keydown.keyCode = keyCode;
+                    if (modifier == $.keyCodes.CONTROL)
+                        keydown.ctrlKey = true;
+                }
+                $(this).trigger(keydown);
+                if (!keydown.isDefaultPrevented()) {
+                    keypress.keyCode = keyCode;
+                    if (modifier == $.keyCodes.CONTROL)
+                        keypress.ctrlKey = true;
+                    $(this).trigger(keypress);
+                    if (!keypress.isDefaultPrevented()) {
+                        keyup.keyCode = keyCode;
+                        if (modifier == $.keyCodes.CONTROL)
+                            keyup.ctrlKey = true;
+                        $(this).trigger(keyup);
+                    }
                 }
             }
         }
     }
-}
-$.fn.Type = function (inputStr) {
-    var $input = $(this);
-    $.each(inputStr.split(''), function (ndx, lmnt) {
-        $input.SendKey(lmnt);
-    });
-}
-
-$.fn.paste = function (inputStr) {
-    var $input = $(this);
-    window.clipboardData ? window.clipboardData.setData("Text", inputStr) : $input[0]._valueSet(inputStr);
-    $input.trigger('paste');
-}
+    $.fn.Type = function (inputStr) {
+        var $input = $(this);
+        $.each(inputStr.split(''), function (ndx, lmnt) {
+            $input.SendKey(lmnt);
+        });
+    }
+    $.fn.paste = function (inputStr) {
+        var $input = $(this);
+        window.clipboardData ? window.clipboardData.setData("Text", inputStr) : $input[0]._valueSet(inputStr);
+        $input.trigger('paste');
+    }
+})(jQuery);

+ 30 - 30
qunit/tests_base.js

@@ -41,7 +41,7 @@ test("inputmask(\"999.999.999\") + backspace", function () {
     $("#testmask")[0].focus();
 
     $("#testmask").Type("123");
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
     equal($("#testmask").val(), "12_.___.___", "Result " + $("#testmask").val());
 
     $("#testmask").remove();
@@ -104,11 +104,11 @@ test("inputmask(\"999.999.999\") - delete 2nd with backspace, continue the mask"
     $("#testmask")[0].focus();
 
     $("#testmask").Type("123");
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
     $("#testmask").Type("4");
-    $("#testmask").SendKey(keyCodes.RIGHT);
+    $("#testmask").SendKey($.keyCodes.RIGHT);
     $("#testmask").Type("56");
 
     equal($("#testmask").val(), "143.56_.___", "Result " + $("#testmask").val());
@@ -126,12 +126,12 @@ test("inputmask(\"999.999.999\") - delete 2nd with delete, continue the mask", f
     $("#testmask").SendKey(49);
     $("#testmask").SendKey(50);
     $("#testmask").SendKey(51);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.DELETE);
     $("#testmask").SendKey(52);
-    $("#testmask").SendKey(keyCodes.RIGHT);
+    $("#testmask").SendKey($.keyCodes.RIGHT);
     $("#testmask").SendKey(53);
     $("#testmask").SendKey(54);
 
@@ -148,8 +148,8 @@ test("inputmask(\"999.999.999\") - delete selection start with nomask", function
     $("#testmask")[0].focus();
 
     $("#testmask").Type("123456789");
-    caret($("#testmask"), 3, 7);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $.caret($("#testmask"), 3, 7);
+    $("#testmask").SendKey($.keyCodes.DELETE);
 
     equal($("#testmask").val(), "123.789.___", "Result " + $("#testmask").val());
 
@@ -164,8 +164,8 @@ test("inputmask(\"999.999.999\") - backspace selection start with nomask", funct
     $("#testmask")[0].focus();
 
     $("#testmask").Type("123456789");
-    caret($("#testmask"), 3, 7);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $.caret($("#testmask"), 3, 7);
+    $("#testmask").SendKey($.keyCodes.DELETE);
 
     equal($("#testmask").val(), "123.789.___", "Result " + $("#testmask").val());
 
@@ -180,7 +180,7 @@ test("inputmask(\"999.999.999\") - overtype selection start with nomask", functi
     $("#testmask")[0].focus();
 
     $("#testmask").Type("123456789");
-    caret($("#testmask"), 3, 7);
+    $.caret($("#testmask"), 3, 7);
     $("#testmask").Type("1");
 
     equal($("#testmask").val(), "123.178.9__", "Result " + $("#testmask").val());
@@ -196,7 +196,7 @@ test("inputmask(\"*****\")", function () {
     $("#testmask")[0].focus();
 
     $("#testmask").Type("abe");
-    $("#testmask").SendKey(keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
     $("#testmask").Type("cd");
 
     equal($("#testmask").val(), "abcde", "Result " + $("#testmask").val());
@@ -212,8 +212,8 @@ test("inputmask(\"d/m/y\")", function () {
     $("#testmask")[0].focus();
 
     $("#testmask").Type("23031973");
-    caret($("#testmask"), 5);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $.caret($("#testmask"), 5);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
 
     equal($("#testmask").val(), "23/0_/1973", "Result " + $("#testmask").val());
 
@@ -228,7 +228,7 @@ test("inputmask(\"(999)999-9999\") - ruslanfedoseenko mask", function () {
     $("#testmask")[0].focus();
 
     $("#testmask").val("9999999999");
-    caret($("#testmask"), 4, 5);
+    $.caret($("#testmask"), 4, 5);
     $("#testmask").Type("7");
     equal($("#testmask").val(), "(999)999-9999", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -241,7 +241,7 @@ test("inputmask(\"(999)999-9999\") - insert false - ruslanfedoseenko mask", func
     $("#testmask")[0].focus();
 
     $("#testmask").val("9999999999");
-    caret($("#testmask"), 4, 5);
+    $.caret($("#testmask"), 4, 5);
     $("#testmask").Type("7");
     equal($("#testmask").val(), "(999)999-9999", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -267,7 +267,7 @@ test("Intergroup selection - dhilt", function () {
     $("#testmask")[0].focus();
     $("#testmask").Type("23314");
 
-    caret($("#testmask"), 4, 7);
+    $.caret($("#testmask"), 4, 7);
     $("#testmask").SendKey("6");
     equal($("#testmask").val(), "23/06/y014", "Result " + $("#testmask").val());
 
@@ -282,8 +282,8 @@ test("Delete selection with non-masks", function () {
     $("#testmask")[0].focus();
     $("#testmask").Type("9999999999");
 
-    caret($("#testmask"), 8, 11);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $.caret($("#testmask"), 8, 11);
+    $("#testmask").SendKey($.keyCodes.DELETE);
     equal($("#testmask").val(), "(999)999-99__", "Result " + $("#testmask").val());
 
     $("#testmask").remove();
@@ -298,7 +298,7 @@ test("inputmask(\"*\", { greedy: false, repeat: \"*\" }) - replace cd with 1", f
     $("#testmask")[0].focus();
 
     $("#testmask").Type("abcdef");
-    caret($("#testmask"), 2, 4);
+    $.caret($("#testmask"), 2, 4);
     $("#testmask").SendKey("1");
     equal($("#testmask").val(), "ab1ef", "Result " + $("#testmask").val());
 
@@ -448,7 +448,7 @@ test("inputmask(\"99 999 999 999 9999 \\D\\E*** 9999\") ~ value=\"01650103002000
     var $fixture = $("#qunit-fixture");
     $fixture.append('<input type="text" id="testmask" value="016501030020001DE1015170" />');
     $("#testmask").inputmask("99 999 999 999 9999 \\D\\E*** 9999");
-    caret($("#testmask"), 13, 14);
+    $.caret($("#testmask"), 13, 14);
     $("#testmask").Type("3");
     equal($("#testmask").val(), "01 650 103 003 0001 DE101 5170", "Result " + $("#testmask").val());
 
@@ -459,7 +459,7 @@ test("inputmask(\"99 999 999 999 9999 \\D\\E*** 9999\") ~ value=\"01650103002000
     var $fixture = $("#qunit-fixture");
     $fixture.append('<input type="text" id="testmask" value="016501030020001DE1015170" />');
     $("#testmask").inputmask("99 999 999 999 9999 \\D\\E*** 9999");
-    caret($("#testmask"), 11, 14);
+    $.caret($("#testmask"), 11, 14);
     $("#testmask").Type("003");
     equal($("#testmask").val(), "01 650 103 003 0001 DE101 5170", "Result " + $("#testmask").val());
 
@@ -470,7 +470,7 @@ test("inputmask(\"99 999 999 999 9999 \\D\\E*** 9999\") ~ value=\"01650103002000
     var $fixture = $("#qunit-fixture");
     $fixture.append('<input type="text" id="testmask" value="016501030020001DE1015170" />');
     $("#testmask").inputmask("99 999 999 999 9999 \\D\\E*** 9999");
-    caret($("#testmask"), 12, 14);
+    $.caret($("#testmask"), 12, 14);
     $("#testmask").Type("01");
     equal($("#testmask").val(), "01 650 103 001 0001 DE101 5170", "Result " + $("#testmask").val());
 
@@ -481,7 +481,7 @@ test("inputmask(\"99 999 999 999 9999 \\D\\E*** 9999\", { greedy: false }) ~ val
     var $fixture = $("#qunit-fixture");
     $fixture.append('<input type="text" id="testmask" value="016501030020001DE1015170" />');
     $("#testmask").inputmask("99 999 999 999 9999 \\D\\E*** 9999", { greedy: false });
-    caret($("#testmask"), 12, 14);
+    $.caret($("#testmask"), 12, 14);
     $("#testmask").Type("01");
     equal($("#testmask").val(), "01 650 103 001 0001 DE101 5170", "Result " + $("#testmask").val());
 
@@ -539,7 +539,7 @@ test("inputmask(\"6703 9999 9999 9999 9\") ~ type \"6703 1234 5678 9012 3\" + ba
     $("#testmask").inputmask("6703 9999 9999 9999 9");
     $("#testmask")[0].focus();
     $("#testmask").Type("1234567890123");
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
 
     equal($("#testmask").val(), "6703 1234 5678 9012 _", "Result " + $("#testmask").val());
 
@@ -554,7 +554,7 @@ asyncTest("inputmask(\"6703 9999 9999 9999 9\") ~ type \"6703670367036\" + backs
     $("#testmask").click();
     setTimeout(function () {
         $("#testmask").Type("6703670367036");
-        $("#testmask").SendKey(keyCodes.BACKSPACE);
+        $("#testmask").SendKey($.keyCodes.BACKSPACE);
         equal($("#testmask").val(), "6703 6703 6703 6703 _", "Result " + $("#testmask").val());
         start();
         $("#testmask").remove();

+ 8 - 8
qunit/tests_date.js

@@ -128,7 +128,7 @@ test("inputmask(\"dd/mm/yyyy\") - input CTRL RIGHT", function () {
     $("#testmask").inputmask("dd/mm/yyyy");
 
     $("#testmask")[0].focus();
-    $("#testmask").SendKey(keyCodes.RIGHT, keyCodes.CONTROL);
+    $("#testmask").SendKey($.keyCodes.RIGHT, $.keyCodes.CONTROL);
     ok($("#testmask").val() != "dd/mm/yyyy", "Result " + $("#testmask").val());
 
     $("#testmask").remove();
@@ -148,10 +148,10 @@ test("inputmask(\"dd/mm/yyyy\") - input 2331973 BACKSPACE x4 2013", function ()
     $("#testmask").SendKey("9");
     $("#testmask").SendKey("7");
     $("#testmask").SendKey("3");
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
     $("#testmask").SendKey("2");
     $("#testmask").SendKey("0");
     $("#testmask").SendKey("1");
@@ -234,7 +234,7 @@ test("inputmask(\"mm/dd/yyyy\") - select some input 1 - Guamaso", function () {
     $("#testmask").inputmask("mm/dd/yyyy");
 
     $("#testmask")[0].focus();
-    caret($("#testmask")[0], 0, 5);
+    $.caret($("#testmask")[0], 0, 5);
     $("#testmask").Type("1");
     equal($("#testmask").val(), "1m/dd/yyyy", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -247,8 +247,8 @@ test("inputmask(\"dd/mm/yyyy\") - input 2331973 - remove 23", function () {
 
     $("#testmask")[0].focus();
     $("#testmask").Type("23031973");
-    caret($("#testmask"), 0, 2);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $.caret($("#testmask"), 0, 2);
+    $("#testmask").SendKey($.keyCodes.DELETE);
 
     equal($("#testmask").val(), "dd/03/1973", "Result " + $("#testmask").val());
 

+ 1 - 1
qunit/tests_dynamic.js

@@ -94,7 +94,7 @@ test("email mask - partial input 2", function () {
 
     $("#testmask")[0].focus();
     $("#testmask").Type("some@mail.com");
-    caret($("#testmask"), 4);
+    $.caret($("#testmask"), 4);
     $("#testmask").Type(".body");
     equal($("#testmask").val(), "some.body@mail.com", "Result " + $("#testmask").val());
 

+ 48 - 48
qunit/tests_numeric.js

@@ -29,7 +29,7 @@ test("integer  type 124 correct to 1234", function () {
 
     $("#testmask")[0].focus();
     $("#testmask").Type("124");
-    caret($("#testmask")[0], 2);
+    $.caret($("#testmask")[0], 2);
     $("#testmask").Type("3");
     equal($("#testmask").val(), "1,234", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -96,7 +96,7 @@ test("numeric placeholder 0 prefix € type 0.123 - backspace - Webunity", funct
 
     $("#testmask")[0].focus();
     $("#testmask").Type("0.123");
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
 
     equal($("#testmask").val(), "€ 0.12", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -114,7 +114,7 @@ test("numeric placeholder 0 prefix € type 0.123 + add 1 in front - Webunity",
 
     $("#testmask")[0].focus();
     $("#testmask").Type("0.123");
-    caret($("#testmask")[0], 2);
+    $.caret($("#testmask")[0], 2);
     $("#testmask").Type("1");
 
     equal($("#testmask").val(), "€ 10.123", "Result " + $("#testmask").val());
@@ -133,7 +133,7 @@ test("numeric placeholder 0 autoGroup: false prefix € type 0.123 + add 123 in
 
     $("#testmask")[0].focus();
     $("#testmask").Type("0.123");
-    caret($("#testmask")[0], 2);
+    $.caret($("#testmask")[0], 2);
     $("#testmask").Type("123");
 
     equal($("#testmask").val(), "€ 1230.123", "Result " + $("#testmask").val());
@@ -152,7 +152,7 @@ test("numeric placeholder 0 autoGroup: true prefix € type 0.123 + add 123 in f
 
     $("#testmask")[0].focus();
     $("#testmask").Type("0.123");
-    caret($("#testmask")[0], 2);
+    $.caret($("#testmask")[0], 2);
     $("#testmask").Type("123");
 
     equal($("#testmask").val(), "€ 1,230.123", "Result " + $("#testmask").val());
@@ -250,7 +250,7 @@ test("numeric alias with allowMinus:false type=text - vijjj", function () {
 
     $("#testmask")[0].focus();
     $("#testmask").Type("123456");
-    caret($("#testmask"), 0);
+    $.caret($("#testmask"), 0);
     $("#testmask").SendKey("-");
 
     equal($("#testmask").val(), "123456", "Result " + $("#testmask").val());
@@ -316,10 +316,10 @@ test("inputmask(\"decimal\", { autoGroup: true, groupSeparator: \",\" }\") - inp
     $("#testmask")[0].focus();
 
     $("#testmask").Type("12345.123");
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
 
     equal($("#testmask").val(), "12,345", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -332,12 +332,12 @@ test("inputmask(\"decimal\", { autoGroup: true, groupSeparator: \",\" }\") - inp
     $("#testmask")[0].focus();
 
     $("#testmask").Type("12345.123");
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.DELETE);
-    $("#testmask").SendKey(keyCodes.DELETE);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.DELETE);
     $("#testmask").Type(".789");
 
     equal($("#testmask").val(), "12,345.789", "Result " + $("#testmask").val());
@@ -352,7 +352,7 @@ test("inputmask(\"decimal\", { autoGroup: true, groupSeparator: \",\" }\") - inp
 
     $("#testmask").Type("12345.123");
     //$("#testmask").click();
-    caret($("#testmask"), 6, 10);
+    $.caret($("#testmask"), 6, 10);
     $("#testmask").Type(".789");
 
     equal($("#testmask").val(), "12,345.789", "Result " + $("#testmask").val());
@@ -367,14 +367,14 @@ test("inputmask(\"decimal\", { autoGroup: false, groupSeparator: \",\" }\") - in
 
     $("#testmask").Type("12345.123");
     //$("#testmask").click();
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.DELETE);
-    $("#testmask").SendKey(keyCodes.DELETE);
-    $("#testmask").SendKey(keyCodes.DELETE);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.DELETE);
 
     equal($("#testmask").val(), "12345", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -387,14 +387,14 @@ test("inputmask(\"decimal\", { autoGroup: false, groupSeparator: \",\" }\") - in
     $("#testmask")[0].focus();
 
     $("#testmask").Type("12345.123");
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.LEFT);
-    $("#testmask").SendKey(keyCodes.DELETE);
-    $("#testmask").SendKey(keyCodes.DELETE);
-    $("#testmask").SendKey(keyCodes.DELETE);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.LEFT);
+    $("#testmask").SendKey($.keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.DELETE);
+    $("#testmask").SendKey($.keyCodes.DELETE);
     $("#testmask").Type(".789");
 
     equal($("#testmask").val(), "12345.789", "Result " + $("#testmask").val());
@@ -448,7 +448,7 @@ test("inputmask(\"decimal\")", function () {
     $("#testmask")[0].focus();
 
     $("#testmask").Type("1234567890");
-    caret($("#testmask"), 0, 10);
+    $.caret($("#testmask"), 0, 10);
     $("#testmask").Type("12345");
 
     equal($("#testmask").val(), "12345", "Result " + $("#testmask").val());
@@ -462,7 +462,7 @@ test("inputmask(\"decimal\") - value=\"1234567890\"", function () {
 
     $("#testmask")[0].focus();
 
-    caret($("#testmask"), 0, 10);
+    $.caret($("#testmask"), 0, 10);
     $("#testmask").Type("12345");
 
     equal($("#testmask").val(), "12345", "Result " + $("#testmask").val());
@@ -477,7 +477,7 @@ test("inputmask(\"decimal\")", function () {
     $("#testmask")[0].focus();
 
     $("#testmask").Type("1234567890");
-    caret($("#testmask"), 3, 5);
+    $.caret($("#testmask"), 3, 5);
     $("#testmask").SendKey("0");
 
     equal($("#testmask").val(), "123067890", "Result " + $("#testmask").val());
@@ -491,7 +491,7 @@ test("inputmask(\"decimal\") - value=\"1234567890\"", function () {
 
     $("#testmask")[0].focus();
 
-    caret($("#testmask"), 3, 5);
+    $.caret($("#testmask"), 3, 5);
     $("#testmask").SendKey("0");
 
     equal($("#testmask").val(), "123067890", "Result " + $("#testmask").val());
@@ -505,7 +505,7 @@ test("inputmask(\"decimal\") - value=\"123.45\" Replace last integer", function
 
     $("#testmask")[0].focus();
     $("#testmask").Type("123.45");
-    caret($("#testmask"), 2, 3);
+    $.caret($("#testmask"), 2, 3);
     $("#testmask").SendKey("7");
 
     equal($("#testmask").val(), "127.45", "Result " + $("#testmask").val());
@@ -519,11 +519,11 @@ test("inputmask(\"decimal\", { digits: 2 }) - value=\"123\" - RomeroMsk", functi
 
     $("#testmask")[0].focus();
     $("#testmask").Type("123");
-    caret($("#testmask"), 0, 3);
+    $.caret($("#testmask"), 0, 3);
     $("#testmask").SendKey(",,..");
-    $("#testmask").SendKey(keyCodes.RIGHT);
-    $("#testmask").SendKey(keyCodes.RIGHT); //needed in test
-    $("#testmask").SendKey(keyCodes.RIGHT); //needed in test
+    $("#testmask").SendKey($.keyCodes.RIGHT);
+    $("#testmask").SendKey($.keyCodes.RIGHT); //needed in test
+    $("#testmask").SendKey($.keyCodes.RIGHT); //needed in test
     $("#testmask").Type("45");
 
     equal($("#testmask").val(), "12345", "Result " + $("#testmask").val());
@@ -565,8 +565,8 @@ test("decimal alias with groupseparator delete - YoussefTaghlabi", function () {
 
     $("#testmask")[0].focus();
     $("#testmask").Type("1234567");
-    caret($("#testmask"), 0);
-    $("#testmask").SendKey(keyCodes.DELETE);
+    $.caret($("#testmask"), 0);
+    $("#testmask").SendKey($.keyCodes.DELETE);
 
     equal($("#testmask").val(), "234,567", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -587,8 +587,8 @@ test("decimal alias with groupseparator backspace - YoussefTaghlabi", function (
 
     $("#testmask")[0].focus();
     $("#testmask").Type("1234567");
-    caret($("#testmask"), 1);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $.caret($("#testmask"), 1);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
 
     equal($("#testmask").val(), "234,567", "Result " + $("#testmask").val());
     $("#testmask").remove();
@@ -629,7 +629,7 @@ test("decimal alias with plus or minus & autogroup - type 123465 - - YoussefTagh
 
     $("#testmask")[0].focus();
     $("#testmask").Type("123456");
-    caret($("#testmask"), 0);
+    $.caret($("#testmask"), 0);
     $("#testmask").SendKey("-");
 
     equal($("#testmask").val(), "-123,456", "Result " + $("#testmask").val());
@@ -680,7 +680,7 @@ test("inputmask(\"decimal\") - value=\"123.1\" tab out", function () {
 
     $("#testmask")[0].focus();
     $("#testmask").Type("123.1");
-    $("#testmask").SendKey(keyCodes.TAB);
+    $("#testmask").SendKey($.keyCodes.TAB);
 
     equal($("#testmask").val(), "123.100", "Result " + $("#testmask").val());
     $("#testmask").remove();

+ 16 - 16
qunit/tests_numericinput.js

@@ -9,12 +9,12 @@ asyncTest("inputmask(\"999.999.999\") - delete 2nd with backspace, continue the
         $("#testmask").SendKey("1");
         $("#testmask").SendKey("2");
         $("#testmask").SendKey("3");
-        $("#testmask").SendKey(keyCodes.RIGHT);
-        $("#testmask").SendKey(keyCodes.RIGHT);
-        $("#testmask").SendKey(keyCodes.RIGHT);
-        $("#testmask").SendKey(keyCodes.BACKSPACE);
+        $("#testmask").SendKey($.keyCodes.RIGHT);
+        $("#testmask").SendKey($.keyCodes.RIGHT);
+        $("#testmask").SendKey($.keyCodes.RIGHT);
+        $("#testmask").SendKey($.keyCodes.BACKSPACE);
         $("#testmask").SendKey("4");
-        $("#testmask").SendKey(keyCodes.LEFT);
+        $("#testmask").SendKey($.keyCodes.LEFT);
         $("#testmask").SendKey("5");
         $("#testmask").SendKey("6");
         start();
@@ -34,11 +34,11 @@ asyncTest("inputmask(\"999.999.999\") - delete 2nd with delete, continue the mas
         $("#testmask").SendKey("1");
         $("#testmask").SendKey("2");
         $("#testmask").SendKey("3");
-        $("#testmask").SendKey(keyCodes.RIGHT);
-        $("#testmask").SendKey(keyCodes.RIGHT);
-        $("#testmask").SendKey(keyCodes.DELETE);
+        $("#testmask").SendKey($.keyCodes.RIGHT);
+        $("#testmask").SendKey($.keyCodes.RIGHT);
+        $("#testmask").SendKey($.keyCodes.DELETE);
         $("#testmask").SendKey("4");
-        $("#testmask").SendKey(keyCodes.LEFT);
+        $("#testmask").SendKey($.keyCodes.LEFT);
         $("#testmask").SendKey("5");
         $("#testmask").SendKey("6");
         start();
@@ -71,7 +71,7 @@ asyncTest("inputmask(\"999-999-999\") - replace selection", function () {
     $("#testmask")[0].focus();
     setTimeout(function () {
         $("#testmask").Type("123456789");
-        caret($("#testmask"), 4, 7);
+        $.caret($("#testmask"), 4, 7);
         $("#testmask").Type("5");
         start();
         equal($("#testmask").val(), "__9-875-321", "Result " + $("#testmask").val());
@@ -88,8 +88,8 @@ asyncTest("inputmask(\"999-999-999\") - replace selection with backspace", funct
     $("#testmask")[0].focus();
     setTimeout(function () {
         $("#testmask").Type("123456789");
-        caret($("#testmask"), 4, 7);
-        $("#testmask").SendKey(keyCodes.BACKSPACE);
+        $.caret($("#testmask"), 4, 7);
+        $("#testmask").SendKey($.keyCodes.BACKSPACE);
         $("#testmask").Type("5");
         start();
         equal($("#testmask").val(), "__9-875-321", "Result " + $("#testmask").val());
@@ -106,8 +106,8 @@ asyncTest("inputmask(\"999-999-999\") - replace selection - with delete", functi
     $("#testmask")[0].focus();
     setTimeout(function () {
         $("#testmask").Type("123456789");
-        caret($("#testmask"), 4, 7);
-        $("#testmask").SendKey(keyCodes.DELETE);
+        $.caret($("#testmask"), 4, 7);
+        $("#testmask").SendKey($.keyCodes.DELETE);
         $("#testmask").Type("5");
         start();
         equal($("#testmask").val(), "__9-875-321", "Result " + $("#testmask").val());
@@ -139,7 +139,7 @@ asyncTest("inputmask({ mask: \"9\", numericInput: true, repeat: 10, greedy: true
     $("#testmask")[0].focus();
     setTimeout(function () {
         $("#testmask").Type("1234567890");
-        caret($("#testmask"), 3, 6);
+        $.caret($("#testmask"), 3, 6);
         $("#testmask").Type("5");
         start();
         equal($("#testmask").val(), "__12357890", "Result " + $("#testmask").val());
@@ -186,7 +186,7 @@ asyncTest("inputmask({ mask: \"€ 999.999.999,99\", numericInput: true }); - 12
     $("#testmask")[0].focus();
     setTimeout(function () {
         $("#testmask").Type("123");
-        caret($("#testmask"), 12);
+        $.caret($("#testmask"), 12);
         $("#testmask").Type("456");
         start();
         equal($("#testmask").val(), "€ ___.__4.561,23", "Result " + $("#testmask").val());

+ 3 - 3
qunit/tests_optional.js

@@ -91,7 +91,7 @@ test("inputmask(\"9[9][9] 999[9] 9999\") - input 123123 space 1234 - vipink70",
 
     $("#testmask")[0].focus();
     $("#testmask").Type("123123");
-    $("#testmask").SendKey(keyCodes.SPACE);
+    $("#testmask").SendKey($.keyCodes.SPACE);
     $("#testmask").Type("1234");
     equal($("#testmask").val(), "123 123 1234", "Result " + $("#testmask").val());
 
@@ -104,7 +104,7 @@ test("inputmask('[9-]AAA.999') ", function () {
     $("#testmask").inputmask('[9-]AAA.999');
 
     $("#testmask").Type("1abc123");
-    caret($("#testmask"), 4, 5);
+    $.caret($("#testmask"), 4, 5);
     $("#testmask").Type("d");
     equal($("#testmask").val(), "1-ABD.123", "Result " + $("#testmask").val());
 
@@ -117,7 +117,7 @@ test("inputmask('9[9]:99') ", function () {
     $("#testmask").inputmask('9[9]:99');
 
     $("#testmask").Type("3:44");
-    caret($("#testmask"), 1);
+    $.caret($("#testmask"), 1);
     $("#testmask").Type("3");
     equal($("#testmask").val(), "33:44", "Result " + $("#testmask").val());
 

+ 6 - 6
qunit/tests_phone.js

@@ -82,12 +82,12 @@ asyncTest("inputmask(\"phone\") - Brazil switch", 1, function () {
 
 
     $("#testmask")[0].focus();
-    caret($("#testmask"), $("#testmask")[0].value.length); //for FF
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
-    $("#testmask").SendKey(keyCodes.BACKSPACE);
+    $.caret($("#testmask"), $("#testmask")[0].value.length); //for FF
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
+    $("#testmask").SendKey($.keyCodes.BACKSPACE);
     $("#testmask").Type("451234");
     setTimeout(function () {
         equal($("#testmask").val(), "+55-12-12345-1234", "Result " + $("#testmask").val());

+ 1 - 1
qunit/tests_regex.js

@@ -280,7 +280,7 @@ test("inputmask(\"Regex\", {regex: \"[а-яА-Я\\s]*\"}) - type space - SilentI
     $("#testmask").inputmask("Regex", { regex: "[а-яА-Я\\s]*" });
 
     $("#testmask")[0].focus();
-    $("#testmask").SendKey(keyCodes.SPACE);
+    $("#testmask").SendKey($.keyCodes.SPACE);
 
     equal($("#testmask").val(), " ", "Result " + $("#testmask").val());