fixup definitions for phone alias

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.3.2-20",
+  "version": "3.3.2-25",
   "main": [
     "./dist/inputmask/inputmask.js"
   ],

component.json

@@ -2,7 +2,7 @@
   "name": "jquery_inputmask",
   "repository": "robinherbots/jquery.inputmask",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-  "version": "3.3.2-20",
+  "version": "3.3.2-25",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "main": "./dist/jquery.inputmask.bundle.js",
   "scripts": [

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "robinherbots/jquery.inputmask",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-  "version": "3.3.2-20",
+  "version": "3.3.2-25",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "homepage": "http://robinherbots.github.io/jquery.inputmask",

dist/inputmask/inputmask.date.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);

dist/inputmask/inputmask.dependencyLib.jquery.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery")) : factory(jQuery);

dist/inputmask/inputmask.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);

dist/inputmask/inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery")) : factory(window.dependencyLib || jQuery);
@@ -267,8 +267,8 @@
         }
         function resetMaskSet(soft) {
             var maskset = getMaskSet();
-            maskset.buffer = void 0, soft !== !0 && (maskset.tests = {}, maskset._buffer = void 0, 
-            maskset.validPositions = {}, maskset.p = 0);
+            maskset.buffer = void 0, soft !== !0 && (maskset._buffer = void 0, maskset.validPositions = {}, 
+            maskset.p = 0);
         }
         function getLastValidPosition(closestTo, strict, validPositions) {
             var before = -1, after = -1, valids = validPositions || getMaskSet().validPositions;
@@ -502,8 +502,7 @@
         }
         function refreshFromBuffer(start, end, buffer) {
             var i;
-            if (start === !0) resetMaskSet(), start = 0, end = buffer.length; else for (i = start; end > i; i++) delete getMaskSet().validPositions[i], 
-            delete getMaskSet().tests[i];
+            if (start === !0) resetMaskSet(), start = 0, end = buffer.length; else for (i = start; end > i; i++) delete getMaskSet().validPositions[i];
             for (i = start; end > i; i++) resetMaskSet(!0), buffer[i] !== opts.skipOptionalPartCharacter && isValid(i, buffer[i], !0, !0);
         }
         function casing(elem, test, pos) {
@@ -572,7 +571,7 @@
                 }), rslt;
             }
             function alternate(pos, c, strict, fromSetValid) {
-                for (var lastAlt, alternation, isValidRslt, altPos, i, validPos, validPsClone = $.extend(!0, {}, getMaskSet().validPositions), testsClone = $.extend(!0, {}, getMaskSet().tests), lAlt = getLastValidPosition(); lAlt >= 0 && (altPos = getMaskSet().validPositions[lAlt], 
+                for (var lastAlt, alternation, isValidRslt, altPos, i, validPos, validPsClone = $.extend(!0, {}, getMaskSet().validPositions), lAlt = getLastValidPosition(); lAlt >= 0 && (altPos = getMaskSet().validPositions[lAlt], 
                 !altPos || void 0 === altPos.alternation || (lastAlt = lAlt, alternation = getMaskSet().validPositions[lastAlt].alternation, 
                 getTestTemplate(lastAlt).locator[altPos.alternation] === altPos.locator[altPos.alternation])); lAlt--) ;
                 if (void 0 !== alternation) {
@@ -601,7 +600,7 @@
                                 if (decisionTaker !== possibilityPos.locator[alternation]) {
                                     for (i = decisionPos + 1; i < getLastValidPosition(void 0, !0) + 1; i++) validPos = getMaskSet().validPositions[i], 
                                     validPos && null != validPos.match.fn ? validInputs.push(validPos.input) : pos > i && staticInputsBeforePos++, 
-                                    delete getMaskSet().validPositions[i], delete getMaskSet().tests[i];
+                                    delete getMaskSet().validPositions[i];
                                     for (resetMaskSet(!0), opts.keepStatic = !opts.keepStatic, isValidRslt = !0; validInputs.length > 0; ) {
                                         var input = validInputs.shift();
                                         if (input !== opts.skipOptionalPartCharacter && !(isValidRslt = isValid(getLastValidPosition(void 0, !0) + 1, input, !1, fromSetValid))) break;
@@ -614,7 +613,7 @@
                                         pos += staticInputsBeforePosAlternate - staticInputsBeforePos, isValidRslt = isValid(pos > targetLvp ? targetLvp : pos, c, strict, fromSetValid);
                                     }
                                     if (opts.keepStatic = !opts.keepStatic, isValidRslt) return isValidRslt;
-                                    resetMaskSet(), getMaskSet().validPositions = $.extend(!0, {}, validPsClone), getMaskSet().tests = $.extend(!0, {}, testsClone);
+                                    resetMaskSet(), getMaskSet().validPositions = $.extend(!0, {}, validPsClone);
                                 }
                             }
                         }
@@ -688,7 +687,7 @@
         function seekPrevious(pos, newBlock) {
             var position = pos;
             if (0 >= position) return 0;
-            for (;--position > 0 && (newBlock === !0 && getTest(position).match.newBlockMarker !== !0 || newBlock !== !0 && !isMask(position)); ) ;
+            for (;--position > 0 && (newBlock === !0 && getTest(position).match.newBlockMarker !== !0 || newBlock !== !0 && !isMask(position) && getTests(position).length < 2); ) ;
             return position;
         }
         function getBufferElement(position) {
@@ -936,7 +935,7 @@
             void 0 === getMaskSet().validPositions[pos.begin] || getMaskSet().validPositions[pos.begin].input !== opts.groupSeparator && getMaskSet().validPositions[pos.begin].input !== opts.radixPoint || pos.end++), 
             stripValidPositions(pos.begin, pos.end, !1, strict), strict !== !0 && generalize();
             var lvp = getLastValidPosition(pos.begin);
-            lvp < pos.begin ? (-1 === lvp && resetMaskSet(), getMaskSet().p = seekNext(lvp)) : strict !== !0 && (getMaskSet().p = pos.begin);
+            lvp < pos.begin ? getMaskSet().p = seekNext(lvp) : strict !== !0 && (getMaskSet().p = pos.begin);
         }
         function keydownEvent(e) {
             var input = this, $input = $(input), k = e.keyCode, pos = caret(input);

dist/inputmask/inputmask.numeric.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);

dist/inputmask/inputmask.phone.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);
@@ -13,7 +13,9 @@
             countrycode: "",
             phoneCodes: [],
             mask: function(opts) {
-                return opts.definitions["#"] = opts.definitions[9], opts.phoneCodes.sort(function(a, b) {
+                return opts.definitions = {
+                    "#": opts.definitions[9]
+                }, opts.phoneCodes.sort(function(a, b) {
                     return (a.mask || a) < (b.mask || b) ? -1 : 1;
                 });
             },

dist/inputmask/inputmask.regex.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "inputmask.dependencyLib", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("./inputmask.dependencyLib.jquery"), require("./inputmask")) : factory(window.dependencyLib || jQuery, window.Inputmask);

dist/inputmask/jquery.inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);

dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function($) {
     function Inputmask(alias, options) {
@@ -265,8 +265,8 @@
         }
         function resetMaskSet(soft) {
             var maskset = getMaskSet();
-            maskset.buffer = void 0, soft !== !0 && (maskset.tests = {}, maskset._buffer = void 0, 
-            maskset.validPositions = {}, maskset.p = 0);
+            maskset.buffer = void 0, soft !== !0 && (maskset._buffer = void 0, maskset.validPositions = {}, 
+            maskset.p = 0);
         }
         function getLastValidPosition(closestTo, strict, validPositions) {
             var before = -1, after = -1, valids = validPositions || getMaskSet().validPositions;
@@ -500,8 +500,7 @@
         }
         function refreshFromBuffer(start, end, buffer) {
             var i;
-            if (start === !0) resetMaskSet(), start = 0, end = buffer.length; else for (i = start; end > i; i++) delete getMaskSet().validPositions[i], 
-            delete getMaskSet().tests[i];
+            if (start === !0) resetMaskSet(), start = 0, end = buffer.length; else for (i = start; end > i; i++) delete getMaskSet().validPositions[i];
             for (i = start; end > i; i++) resetMaskSet(!0), buffer[i] !== opts.skipOptionalPartCharacter && isValid(i, buffer[i], !0, !0);
         }
         function casing(elem, test, pos) {
@@ -570,7 +569,7 @@
                 }), rslt;
             }
             function alternate(pos, c, strict, fromSetValid) {
-                for (var lastAlt, alternation, isValidRslt, altPos, i, validPos, validPsClone = $.extend(!0, {}, getMaskSet().validPositions), testsClone = $.extend(!0, {}, getMaskSet().tests), lAlt = getLastValidPosition(); lAlt >= 0 && (altPos = getMaskSet().validPositions[lAlt], 
+                for (var lastAlt, alternation, isValidRslt, altPos, i, validPos, validPsClone = $.extend(!0, {}, getMaskSet().validPositions), lAlt = getLastValidPosition(); lAlt >= 0 && (altPos = getMaskSet().validPositions[lAlt], 
                 !altPos || void 0 === altPos.alternation || (lastAlt = lAlt, alternation = getMaskSet().validPositions[lastAlt].alternation, 
                 getTestTemplate(lastAlt).locator[altPos.alternation] === altPos.locator[altPos.alternation])); lAlt--) ;
                 if (void 0 !== alternation) {
@@ -599,7 +598,7 @@
                                 if (decisionTaker !== possibilityPos.locator[alternation]) {
                                     for (i = decisionPos + 1; i < getLastValidPosition(void 0, !0) + 1; i++) validPos = getMaskSet().validPositions[i], 
                                     validPos && null != validPos.match.fn ? validInputs.push(validPos.input) : pos > i && staticInputsBeforePos++, 
-                                    delete getMaskSet().validPositions[i], delete getMaskSet().tests[i];
+                                    delete getMaskSet().validPositions[i];
                                     for (resetMaskSet(!0), opts.keepStatic = !opts.keepStatic, isValidRslt = !0; validInputs.length > 0; ) {
                                         var input = validInputs.shift();
                                         if (input !== opts.skipOptionalPartCharacter && !(isValidRslt = isValid(getLastValidPosition(void 0, !0) + 1, input, !1, fromSetValid))) break;
@@ -612,7 +611,7 @@
                                         pos += staticInputsBeforePosAlternate - staticInputsBeforePos, isValidRslt = isValid(pos > targetLvp ? targetLvp : pos, c, strict, fromSetValid);
                                     }
                                     if (opts.keepStatic = !opts.keepStatic, isValidRslt) return isValidRslt;
-                                    resetMaskSet(), getMaskSet().validPositions = $.extend(!0, {}, validPsClone), getMaskSet().tests = $.extend(!0, {}, testsClone);
+                                    resetMaskSet(), getMaskSet().validPositions = $.extend(!0, {}, validPsClone);
                                 }
                             }
                         }
@@ -686,7 +685,7 @@
         function seekPrevious(pos, newBlock) {
             var position = pos;
             if (0 >= position) return 0;
-            for (;--position > 0 && (newBlock === !0 && getTest(position).match.newBlockMarker !== !0 || newBlock !== !0 && !isMask(position)); ) ;
+            for (;--position > 0 && (newBlock === !0 && getTest(position).match.newBlockMarker !== !0 || newBlock !== !0 && !isMask(position) && getTests(position).length < 2); ) ;
             return position;
         }
         function getBufferElement(position) {
@@ -934,7 +933,7 @@
             void 0 === getMaskSet().validPositions[pos.begin] || getMaskSet().validPositions[pos.begin].input !== opts.groupSeparator && getMaskSet().validPositions[pos.begin].input !== opts.radixPoint || pos.end++), 
             stripValidPositions(pos.begin, pos.end, !1, strict), strict !== !0 && generalize();
             var lvp = getLastValidPosition(pos.begin);
-            lvp < pos.begin ? (-1 === lvp && resetMaskSet(), getMaskSet().p = seekNext(lvp)) : strict !== !0 && (getMaskSet().p = pos.begin);
+            lvp < pos.begin ? getMaskSet().p = seekNext(lvp) : strict !== !0 && (getMaskSet().p = pos.begin);
         }
         function keydownEvent(e) {
             var input = this, $input = $(input), k = e.keyCode, pos = caret(input);
@@ -2490,7 +2489,9 @@
             countrycode: "",
             phoneCodes: [],
             mask: function(opts) {
-                return opts.definitions["#"] = opts.definitions[9], opts.phoneCodes.sort(function(a, b) {
+                return opts.definitions = {
+                    "#": opts.definitions[9]
+                }, opts.phoneCodes.sort(function(a, b) {
                     return (a.mask || a) < (b.mask || b) ? -1 : 1;
                 });
             },

dist/min/inputmask/inputmask.dependencyLib.jquery.min.js

@@ -3,6 +3,6 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2016 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.2-20
+* Version: 3.3.2-25
 */
 !function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){return window.dependencyLib=a,a});

js/inputmask.js

@@ -780,7 +780,6 @@
 			var maskset = getMaskSet();
 			maskset.buffer = undefined;
 			if (soft !== true) {
-				maskset.tests = {};
 				maskset._buffer = undefined;
 				maskset.validPositions = {};
 				maskset.p = 0;
@@ -1295,7 +1294,6 @@
 			} else {
 				for (i = start; i < end; i++) {
 					delete getMaskSet().validPositions[i];
-					delete getMaskSet().tests[i];
 				}
 			}
 			for (i = start; i < end; i++) {
@@ -1444,7 +1442,6 @@
 
 			function alternate(pos, c, strict, fromSetValid) {
 				var validPsClone = $.extend(true, {}, getMaskSet().validPositions),
-					testsClone = $.extend(true, {}, getMaskSet().tests),
 					lastAlt,
 					alternation,
 					isValidRslt,
@@ -1516,7 +1513,6 @@
 												validInputs.push(validPos.input);
 											} else if (i < pos) staticInputsBeforePos++;
 											delete getMaskSet().validPositions[i];
-											delete getMaskSet().tests[i];
 										}
 										resetMaskSet(true); //clear getbuffer
 										opts.keepStatic = !opts.keepStatic; //disable keepStatic on getMaskLength
@@ -1547,7 +1543,6 @@
 										if (!isValidRslt) {
 											resetMaskSet();
 											getMaskSet().validPositions = $.extend(true, {}, validPsClone);
-											getMaskSet().tests = $.extend(true, {}, testsClone);
 										} else return isValidRslt;
 									}
 								}
@@ -1686,7 +1681,9 @@
 			var maskL = getMaskSet().maskLength;
 			if (pos >= maskL) return maskL;
 			var position = pos;
-			while (++position < maskL && ((newBlock === true && (getTest(position).match.newBlockMarker !== true || !isMask(position))) || (newBlock !== true && !isMask(position)))) {
+			while (++position < maskL &&
+			((newBlock === true && (getTest(position).match.newBlockMarker !== true || !isMask(position))) ||
+			(newBlock !== true && !isMask(position)))) {
 			}
 			return position;
 		}
@@ -1695,7 +1692,9 @@
 			var position = pos;
 			if (position <= 0) return 0;
 
-			while (--position > 0 && ((newBlock === true && getTest(position).match.newBlockMarker !== true) || (newBlock !== true && !isMask(position)))) {
+			while (--position > 0 &&
+			((newBlock === true && getTest(position).match.newBlockMarker !== true) ||
+			(newBlock !== true && !isMask(position) && getTests(position).length < 2))) {
 			}
 
 			return position;
@@ -2254,7 +2253,7 @@
 			}
 			var lvp = getLastValidPosition(pos.begin);
 			if (lvp < pos.begin) {
-				if (lvp === -1) resetMaskSet();
+				//if (lvp === -1) resetMaskSet();
 				getMaskSet().p = seekNext(lvp);
 			} else if (strict !== true) {
 				getMaskSet().p = pos.begin;

package.json

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

qunit/tests_multi.js

@@ -356,7 +356,7 @@ define([
 		$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
 		$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
 		$("#testmask").Type("2abc");
-		assert.equal(testmask.value, "12abc", "Result " + testmask.value);
+		assert.equal(testmask.value, "122abc", "Result " + testmask.value);
 	});
 
 	qunit.test("(99 99 999999)|(i{+}) - 12 3abc - dekdegiv", function (assert) {

qunit/tests_phone.js

@@ -14,104 +14,98 @@ define([
 	"../dist/inputmask/inputmask.regex.extensions",
 	"prototypeExtensions",
 	"simulator"
-], function(qunit, $, Inputmask) {
-
-qunit.module("Phone masks");
-
-asyncTest("inputmask(\"phone be\") - type \"473890428\"", 1, function() {
-	var $fixture = $("#qunit-fixture");
-	$fixture.append('<input type="text" id="testmask" />');
-	var testmask = document.getElementById("testmask");
-
-	Inputmask("phonebe").mask(testmask);
-	testmask.focus();
-	$("#testmask").Type("473890428");
-
-	setTimeout(function() {
-		equal(testmask.value, "+32(473)89-04-28", "Result " + testmask.value);
-		start();
-		$("#testmask").remove();
-	}, 0);
-});
-
-asyncTest("inputmask(\"phone be\") - value \"+32473890428\"", 1, function() {
-	var $fixture = $("#qunit-fixture");
-	$fixture.append('<input type="text" id="testmask" value="+32473890428" />');
-	Inputmask("phonebe").mask(testmask);
-	testmask.focus();
-	setTimeout(function() {
-		equal(testmask.value, "+32(473)89-04-28", "Result " + testmask.value);
-		start();
-		$("#testmask").remove();
-	}, 0);
-});
-
-asyncTest("inputmask(\"phone\") - value=\"+32(473)890-428\"", 1, function() {
-	var $fixture = $("#qunit-fixture");
-	$fixture.append('<input type="text" id="testmask" value="+32(473)890-428" />');
-	Inputmask("phone").mask(testmask);
-
-	setTimeout(function() {
-		equal(testmask.value, "+32(473)890-428", "Result " + testmask.value);
-		start();
-		$("#testmask").remove();
-	}, 0);
-});
-
-asyncTest("inputmask(\"phone\") - value=\"32473890428\"", 1, function() {
-	var $fixture = $("#qunit-fixture");
-	$fixture.append('<input type="text" id="testmask" value="32473890428" />');
-	Inputmask("phone").mask(testmask);
-
-	setTimeout(function() {
-		equal(testmask.value, "+32(473)890-428", "Result " + testmask.value);
-		start();
-		$("#testmask").remove();
-	}, 0);
-});
-
-asyncTest("inputmask(\"phone\") - Brazil new", 1, function() {
-	var $fixture = $("#qunit-fixture");
-	$fixture.append('<input type="text" id="testmask" value="5512123451234" />');
-	Inputmask("phone").mask(testmask);
-
-	setTimeout(function() {
-		equal(testmask.value, "+55-12-12345-1234", "Result " + testmask.value);
-		start();
-		$("#testmask").remove();
-	}, 0);
-});
-
-asyncTest("inputmask(\"phone\") - Brazil old", 1, function() {
-	var $fixture = $("#qunit-fixture");
-	$fixture.append('<input type="text" id="testmask" value="55121234-1234" />');
-	Inputmask("phone").mask(testmask);
-
-	setTimeout(function() {
-		equal(testmask.value, "+55-12-1234-1234", "Result " + testmask.value);
-		start();
-		$("#testmask").remove();
-	}, 0);
-});
-
-asyncTest("inputmask(\"phone\") - Brazil switch", 1, function() {
-	var $fixture = $("#qunit-fixture");
-	$fixture.append('<input type="text" id="testmask" value="55121234-1234" />');
-	Inputmask("phone").mask(testmask);
-
-	testmask.focus();
-	$.caret(testmask, $("#testmask")[0].value.length); //for FF
-	$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
-	$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
-	$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
-	$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
-	$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
-	$("#testmask").Type("451234");
-	setTimeout(function() {
-		equal(testmask.value, "+55-12-12345-1234", "Result " + testmask.value);
-		start();
-		$("#testmask").remove();
-	}, 0);
-});
+], function (qunit, $, Inputmask) {
+
+	qunit.module("Phone masks");
+
+	qunit.test("inputmask(\"phone be\") - type \"473890428\"", 1, function (assert) {
+		var done = assert.async(), $fixture =$("#qunit-fixture");
+		$fixture.append('<input type="text" id="testmask" />');
+		var testmask = document.getElementById("testmask");
+
+		Inputmask("phonebe").mask(testmask);
+		testmask.focus();
+		$("#testmask").Type("473890428");
+
+		setTimeout(function () {
+			equal(testmask.value, "+32(473)89-04-28", "Result " + testmask.value);
+			done();
+		}, 0);
+	});
+
+	qunit.test("inputmask(\"phone be\") - value \"+32473890428\"", 1, function (assert) {
+		var done = assert.async(), $fixture =$("#qunit-fixture");
+		$fixture.append('<input type="text" id="testmask" value="+32473890428" />');
+		Inputmask("phonebe").mask(testmask);
+		testmask.focus();
+		setTimeout(function () {
+			equal(testmask.value, "+32(473)89-04-28", "Result " + testmask.value);
+			done();
+		}, 0);
+	});
+
+	qunit.test("inputmask(\"phone\") - value=\"+32(473)890-428\"", 1, function (assert) {
+		var done = assert.async(), $fixture =$("#qunit-fixture");
+		$fixture.append('<input type="text" id="testmask" value="+32(473)890-428" />');
+		Inputmask("phone").mask(testmask);
+
+		setTimeout(function () {
+			equal(testmask.value, "+32(473)890-428", "Result " + testmask.value);
+			done();
+		}, 0);
+	});
+
+	qunit.test("inputmask(\"phone\") - value=\"32473890428\"", 1, function (assert) {
+		var done = assert.async(), $fixture =$("#qunit-fixture");
+		$fixture.append('<input type="text" id="testmask" value="32473890428" />');
+		Inputmask("phone").mask(testmask);
+
+		setTimeout(function () {
+			equal(testmask.value, "+32(473)890-428", "Result " + testmask.value);
+			done();
+		}, 0);
+	});
+
+	qunit.test("inputmask(\"phone\") - Brazil new", 1, function (assert) {
+		var done = assert.async(), $fixture =$("#qunit-fixture");
+		$fixture.append('<input type="text" id="testmask" value="5512123451234" />');
+		Inputmask("phone").mask(testmask);
+
+		setTimeout(function () {
+			equal(testmask.value, "+55-12-12345-1234", "Result " + testmask.value);
+			done();
+		}, 0);
+	});
+
+	qunit.test("inputmask(\"phone\") - Brazil old", 1, function (assert) {
+		var done = assert.async(), $fixture =$("#qunit-fixture");
+		$fixture.append('<input type="text" id="testmask" value="55121234-1234" />');
+		Inputmask("phone").mask(testmask);
+
+		setTimeout(function () {
+			equal(testmask.value, "+55-12-1234-1234", "Result " + testmask.value);
+			done();
+		}, 0);
+	});
+
+	qunit.test("inputmask(\"phone\") - Brazil switch", 1, function (assert) {
+		var done = assert.async(), $fixture =$("#qunit-fixture");
+		$fixture.append('<input type="text" id="testmask" value="55121234-1234" />');
+		Inputmask("phone").mask(testmask);
+
+		testmask.focus();
+		$.caret(testmask, $("#testmask")[0].value.length); //for FF
+		$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
+		$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
+		$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
+		$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
+		$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
+		$("#testmask").SendKey(Inputmask.keyCode.BACKSPACE);
+		$("#testmask").Type("451234");
+		setTimeout(function () {
+			equal(testmask.value, "+55-12-12345-1234", "Result " + testmask.value);
+			done();
+		}, 0);
+	});
 
 });