Browse Source

fix delete

Robin Herbots 11 years ago
parent
commit
07cebb1023

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
 {
     "name": "jquery.inputmask",
     "name": "jquery.inputmask",
-    "version": "3.0.48",
+    "version": "3.0.49",
     "main": "./dist/jquery.inputmask.bundle.js",
     "main": "./dist/jquery.inputmask.bundle.js",
 	"keywords" : ["jQuery", "plugins", "input", "form", "inputmask", "mask"],
 	"keywords" : ["jQuery", "plugins", "input", "form", "inputmask", "mask"],
 	"description": "jquery.inputmask is a jquery plugin which create an input mask.",
 	"description": "jquery.inputmask is a jquery plugin which create an input mask.",

+ 1 - 1
build.properties

@@ -7,7 +7,7 @@ distdir = dist
 
 
 build.major = 3
 build.major = 3
 build.minor = 0
 build.minor = 0
-build.revision = 48
+build.revision = 49
 
 
 target = jquery.inputmask.bundle.js
 target = jquery.inputmask.bundle.js
 target.min = jquery.inputmask.bundle.min.js
 target.min = jquery.inputmask.bundle.min.js

+ 20 - 27
dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2014 Robin Herbots
 * Copyright (c) 2010 - 2014 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.0.48
+* Version: 3.0.49
 */
 */
 
 
 (function ($) {
 (function ($) {
@@ -988,31 +988,23 @@
 
 
             function handleRemove(input, k, pos) {
             function handleRemove(input, k, pos) {
                 if (opts.numericInput || isRTL) {
                 if (opts.numericInput || isRTL) {
-                    switch (k) {
-                        case opts.keyCode.BACKSPACE:
-                            k = opts.keyCode.DELETE;
-                            break;
-                        case opts.keyCode.DELETE:
-                            k = opts.keyCode.BACKSPACE;
-                            break;
-                    }
+                    if (k == opts.keyCode.BACKSPACE)
+                        k = opts.keyCode.DELETE;
+                    else if (k == opts.keyCode.DELETE)
+                        k = opts.keyCode.BACKSPACE;
+
                     if (isRTL) {
                     if (isRTL) {
                         var pend = pos.end;
                         var pend = pos.end;
                         pos.end = pos.begin;
                         pos.end = pos.begin;
                         pos.begin = pend;
                         pos.begin = pend;
                     }
                     }
-                }
-
-                if (pos.begin == pos.end) {
-                    if (k == opts.keyCode.BACKSPACE)
-                        pos.begin = seekPrevious(pos.begin);
-                    else if (k == opts.keyCode.DELETE)
-                        pos.end++;
-                } else if (pos.end - pos.begin == 1 && !opts.insertMode) {
-                    if (k == opts.keyCode.BACKSPACE)
-                        pos.begin--;
-                }
-
+                }
+
+                if (k == opts.keyCode.BACKSPACE && pos.end - pos.begin <= 1)
+                    pos.begin = seekPrevious(pos.begin);
+                else if (k == opts.keyCode.DELETE && pos.begin == pos.end)
+                    pos.end++;
+
                 stripValidPositions(pos.begin, pos.end);
                 stripValidPositions(pos.begin, pos.end);
                 var firstMaskedPos = getLastValidPosition(pos.begin);
                 var firstMaskedPos = getLastValidPosition(pos.begin);
                 if (firstMaskedPos < pos.begin) {
                 if (firstMaskedPos < pos.begin) {
@@ -1675,6 +1667,7 @@
                         }
                         }
                         return $.isArray(opts.mask);
                         return $.isArray(opts.mask);
                     default:
                     default:
+                        resolveAlias(opts.alias, options, opts);
                         //check if the fn is an alias
                         //check if the fn is an alias
                         if (!resolveAlias(fn, options, opts)) {
                         if (!resolveAlias(fn, options, opts)) {
                             //maybe fn is a mask so we try
                             //maybe fn is a mask so we try
@@ -1721,7 +1714,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2014 Robin Herbots
 * Copyright (c) 2010 - 2014 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.0.48
+* Version: 3.0.49
 */
 */
 
 
 (function ($) {
 (function ($) {
@@ -2084,7 +2077,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.0.48
+Version: 3.0.49
 
 
 Optional extensions on the jquery.inputmask base
 Optional extensions on the jquery.inputmask base
 */
 */
@@ -2205,7 +2198,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.0.48
+Version: 3.0.49
 
 
 Optional extensions on the jquery.inputmask base
 Optional extensions on the jquery.inputmask base
 */
 */
@@ -2668,7 +2661,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.0.48
+Version: 3.0.49
 
 
 Optional extensions on the jquery.inputmask base
 Optional extensions on the jquery.inputmask base
 */
 */
@@ -2891,7 +2884,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.0.48
+Version: 3.0.49
 
 
 Regex extensions on the jquery.inputmask base
 Regex extensions on the jquery.inputmask base
 Allows for using regular expressions as a mask
 Allows for using regular expressions as a mask
@@ -3078,7 +3071,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2014 Robin Herbots
 Copyright (c) 2010 - 2014 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 3.0.48
+Version: 3.0.49
 
 
 Phone extension.
 Phone extension.
 When using this extension make sure you specify the correct url to get the masks
 When using this extension make sure you specify the correct url to get the masks

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


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


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


+ 1 - 1
jquery.inputmask.jquery.json

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

+ 10 - 17
js/jquery.inputmask.js

@@ -988,14 +988,11 @@
 
 
             function handleRemove(input, k, pos) {
             function handleRemove(input, k, pos) {
                 if (opts.numericInput || isRTL) {
                 if (opts.numericInput || isRTL) {
-                    switch (k) {
-                        case opts.keyCode.BACKSPACE:
-                            k = opts.keyCode.DELETE;
-                            break;
-                        case opts.keyCode.DELETE:
-                            k = opts.keyCode.BACKSPACE;
-                            break;
-                    }
+                    if (k == opts.keyCode.BACKSPACE)
+                        k = opts.keyCode.DELETE;
+                    else if (k == opts.keyCode.DELETE)
+                        k = opts.keyCode.BACKSPACE;
+
                     if (isRTL) {
                     if (isRTL) {
                         var pend = pos.end;
                         var pend = pos.end;
                         pos.end = pos.begin;
                         pos.end = pos.begin;
@@ -1003,15 +1000,10 @@
                     }
                     }
                 }
                 }
 
 
-                if (pos.begin == pos.end) {
-                    if (k == opts.keyCode.BACKSPACE)
-                        pos.begin = seekPrevious(pos.begin);
-                    else if (k == opts.keyCode.DELETE)
-                        pos.end++;
-                } else if (pos.end - pos.begin == 1 && !opts.insertMode) {
-                    if (k == opts.keyCode.BACKSPACE)
-                        pos.begin--;
-                }
+                if (k == opts.keyCode.BACKSPACE && pos.end - pos.begin <= 1)
+                    pos.begin = seekPrevious(pos.begin);
+                else if (k == opts.keyCode.DELETE && pos.begin == pos.end)
+                    pos.end++;
 
 
                 stripValidPositions(pos.begin, pos.end);
                 stripValidPositions(pos.begin, pos.end);
                 var firstMaskedPos = getLastValidPosition(pos.begin);
                 var firstMaskedPos = getLastValidPosition(pos.begin);
@@ -1675,6 +1667,7 @@
                         }
                         }
                         return $.isArray(opts.mask);
                         return $.isArray(opts.mask);
                     default:
                     default:
+                        resolveAlias(opts.alias, options, opts);
                         //check if the fn is an alias
                         //check if the fn is an alias
                         if (!resolveAlias(fn, options, opts)) {
                         if (!resolveAlias(fn, options, opts)) {
                             //maybe fn is a mask so we try
                             //maybe fn is a mask so we try