Robin Herbots 8 年 前
コミット
f8b9ce3830
49 ファイル変更187 行追加200 行削除
  1. 2 0
      CHANGELOG.md
  2. 4 4
      Gruntfile.js
  3. 3 3
      bower.json
  4. 4 4
      component.json
  5. 4 4
      composer.json
  6. 1 1
      dist/inputmask/bindings/inputmask.binding.js
  7. 1 1
      dist/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.js
  8. 1 1
      dist/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.js
  9. 1 1
      dist/inputmask/dependencyLibs/inputmask.dependencyLib.js
  10. 1 1
      dist/inputmask/global/document.js
  11. 1 1
      dist/inputmask/global/window.js
  12. 1 1
      dist/inputmask/inputmask.date.extensions.js
  13. 1 1
      dist/inputmask/inputmask.extensions.js
  14. 37 42
      dist/inputmask/inputmask.js
  15. 1 1
      dist/inputmask/inputmask.numeric.extensions.js
  16. 1 1
      dist/inputmask/inputmask.phone.extensions.js
  17. 1 1
      dist/inputmask/inputmask.regex.extensions.js
  18. 1 1
      dist/inputmask/jquery.inputmask.js
  19. 1 1
      dist/inputmask/phone-codes/phone-be.js
  20. 1 1
      dist/inputmask/phone-codes/phone-nl.js
  21. 1 1
      dist/inputmask/phone-codes/phone-ru.js
  22. 1 1
      dist/inputmask/phone-codes/phone-uk.js
  23. 1 1
      dist/inputmask/phone-codes/phone.js
  24. 37 42
      dist/jquery.inputmask.bundle.js
  25. 1 1
      dist/min/inputmask/bindings/inputmask.binding.min.js
  26. 1 1
      dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.min.js
  27. 1 1
      dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.min.js
  28. 1 1
      dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.min.js
  29. 1 1
      dist/min/inputmask/global/document.min.js
  30. 1 1
      dist/min/inputmask/global/window.min.js
  31. 1 1
      dist/min/inputmask/inputmask.date.extensions.min.js
  32. 1 1
      dist/min/inputmask/inputmask.extensions.min.js
  33. 3 3
      dist/min/inputmask/inputmask.min.js
  34. 1 1
      dist/min/inputmask/inputmask.numeric.extensions.min.js
  35. 1 1
      dist/min/inputmask/inputmask.phone.extensions.min.js
  36. 1 1
      dist/min/inputmask/inputmask.regex.extensions.min.js
  37. 1 1
      dist/min/inputmask/jquery.inputmask.min.js
  38. 1 1
      dist/min/inputmask/phone-codes/phone-be.min.js
  39. 1 1
      dist/min/inputmask/phone-codes/phone-nl.min.js
  40. 1 1
      dist/min/inputmask/phone-codes/phone-ru.min.js
  41. 1 1
      dist/min/inputmask/phone-codes/phone-uk.min.js
  42. 1 1
      dist/min/inputmask/phone-codes/phone.min.js
  43. 4 4
      dist/min/jquery.inputmask.bundle.min.js
  44. 1 0
      index.html
  45. 37 43
      js/inputmask.js
  46. 5 5
      nuspecs/jquery.inputmask.linux.nuspec
  47. 5 5
      nuspecs/jquery.inputmask.nuspec
  48. 1 1
      nuspecs/Readme.txt
  49. 6 6
      package.json

+ 2 - 0
CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 - build-in regex support without extension
 
 ### Updates
+- Change package name to Inputmask to better reflect that Inputmask doesn't require jQuery
 - make removing the inputmask take the autoUnmask option into account
 - enhance inputfallback event (android)
 - restructure project
@@ -14,6 +15,7 @@ All notable changes to this project will be documented in this file.
 	- initialization
 
 ### Fixed
+- Changes are not reflected back to model when using with Vue2 (mobile) #1468
 - Multiple alternators #1553
 - Weird Issue with decimal masking when value is like 0.55 #1512
 - IE 8 problems with currency and jquery.inputmask.bundle.js #1545

+ 4 - 4
Gruntfile.js

@@ -112,13 +112,13 @@ module.exports = function (grunt) {
 		release: {
 			options: {
 				bump: false,
-				commitMessage: 'jquery.inputmask <%= version %>'
+				commitMessage: 'Inputmask <%= version %>'
 			}
 		},
 		nugetpack: {
 			dist: {
 				src: function () {
-					return process.platform === "linux" ? 'nuspecs/jquery.inputmask.linux.nuspec' : 'nuspecs/jquery.inputmask.nuspec';
+					return process.platform === "linux" ? 'nuspecs/Inputmask.linux.nuspec' : 'nuspecs/Inputmask.nuspec';
 				}(),
 				dest: 'dist/',
 				options: {
@@ -128,7 +128,7 @@ module.exports = function (grunt) {
 		},
 		nugetpush: {
 			dist: {
-				src: 'dist/jQuery.InputMask.<%= pkg.version %>.nupkg',
+				src: 'dist/InputMask.<%= pkg.version %>.nupkg',
 				options: {
 					source: "https://www.nuget.org"
 				}
@@ -141,7 +141,7 @@ module.exports = function (grunt) {
 			gitcommitchanges: {
 				command: ['git add .',
 					'git reset -- package.json',
-					'git commit -m "jquery.inputmask <%= pkg.version %>"'
+					'git commit -m "Inputmask <%= pkg.version %>"'
 				].join('&&')
 			}
 		},

+ 3 - 3
bower.json

@@ -1,6 +1,6 @@
 {
-  "name": "jquery.inputmask",
-  "version": "3.3.5-222",
+  "name": "Inputmask",
+  "version": "3.3.5-223",
   "main": [
 	  "./dist/inputmask/inputmask.js",
 	  "./dist/inputmask/inputmask.extensions.js",
@@ -37,5 +37,5 @@
   "authors": [{
     "name": "Robin Herbots"
   }],
-  "homepage": "http://robinherbots.github.io/jquery.inputmask"
+  "homepage": "http://robinherbots.github.io/Inputmask"
 }

+ 4 - 4
component.json

@@ -1,8 +1,8 @@
 {
-	"name": "jquery_inputmask",
-	"repository": "robinherbots/jquery.inputmask",
-	"description": "jquery.inputmask is a jquery plugin which create an input mask.",
-	"version": "3.3.5-222",
+	"name": "Inputmask",
+	"repository": "robinherbots/Inputmask",
+	"description": "Inputmask is a jquery plugin which create an input mask.",
+	"version": "3.3.5-223",
 	"keywords": [
 		"jquery",
 		"plugins",

+ 4 - 4
composer.json

@@ -1,10 +1,10 @@
 {
-  "name": "robinherbots/jquery.inputmask",
-  "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-  "version": "3.3.5-222",
+  "name": "robinherbots/inputmask",
+  "description": "Inputmask is a jquery plugin which create an input mask.",
+  "version": "3.3.5-223",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
-  "homepage": "http://robinherbots.github.io/jquery.inputmask",
+  "homepage": "http://robinherbots.github.io/Inputmask",
   "license": "MIT",
   "authors": [{
     "name": "Robin Herbots"

+ 1 - 1
dist/inputmask/bindings/inputmask.binding.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/dependencyLibs/inputmask.dependencyLib.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/global/document.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 "function" == typeof define && define.amd ? define(function() {

+ 1 - 1
dist/inputmask/global/window.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 "function" == typeof define && define.amd ? define(function() {

+ 1 - 1
dist/inputmask/inputmask.date.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/inputmask.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 37 - 42
dist/inputmask/inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {
@@ -575,7 +575,7 @@
             }), writeOut) {
                 var caretPos = undefined;
                 document.activeElement === input && result && (caretPos = opts.numericInput ? seekPrevious(result.forwardPosition) : result.forwardPosition), 
-                writeBuffer(input, getBuffer(), caretPos, initiatingEvent || new $.Event("checkval"));
+                writeBuffer(input, getBuffer(), caretPos, initiatingEvent || new $.Event("checkval"), initiatingEvent && "input" === initiatingEvent.type);
             }
         }
         function unmaskedvalue(input) {
@@ -780,12 +780,10 @@
                                 break;
 
                               case "click":
-                                if (iemobile || iphone) {
-                                    var that = this, args = arguments;
-                                    return setTimeout(function() {
-                                        eventHandler.apply(that, args);
-                                    }, 0), !1;
-                                }
+                                var that = this, args = arguments;
+                                return setTimeout(function() {
+                                    eventHandler.apply(that, args);
+                                }, 0), !1;
                             }
                             var returnVal = eventHandler.apply(this, arguments);
                             return !1 === returnVal && (e.preventDefault(), e.stopPropagation()), returnVal;
@@ -952,46 +950,43 @@
                 }
             },
             clickEvent: function(e, tabbed) {
-                function doRadixFocus(clickPos) {
-                    if ("" !== opts.radixPoint) {
-                        var vps = getMaskSet().validPositions;
-                        if (vps[clickPos] === undefined || vps[clickPos].input === getPlaceholder(clickPos)) {
-                            if (clickPos < seekNext(-1)) return !0;
-                            var radixPos = $.inArray(opts.radixPoint, getBuffer());
-                            if (-1 !== radixPos) {
-                                for (var vp in vps) if (radixPos < vp && vps[vp].input !== getPlaceholder(vp)) return !1;
-                                return !0;
-                            }
-                        }
-                    }
-                    return !1;
-                }
                 var input = this;
-                setTimeout(function() {
-                    if (document.activeElement === input) {
-                        var selectedCaret = caret(input);
-                        if (tabbed && (isRTL ? selectedCaret.end = selectedCaret.begin : selectedCaret.begin = selectedCaret.end), 
-                        selectedCaret.begin === selectedCaret.end) switch (opts.positionCaretOnClick) {
-                          case "none":
-                            break;
+                if (document.activeElement === input) {
+                    var selectedCaret = caret(input);
+                    if (tabbed && (isRTL ? selectedCaret.end = selectedCaret.begin : selectedCaret.begin = selectedCaret.end), 
+                    selectedCaret.begin === selectedCaret.end) switch (opts.positionCaretOnClick) {
+                      case "none":
+                        break;
 
-                          case "radixFocus":
-                            if (doRadixFocus(selectedCaret.begin)) {
-                                var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
-                                caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
-                                break;
+                      case "radixFocus":
+                        if (function(clickPos) {
+                            if ("" !== opts.radixPoint) {
+                                var vps = getMaskSet().validPositions;
+                                if (vps[clickPos] === undefined || vps[clickPos].input === getPlaceholder(clickPos)) {
+                                    if (clickPos < seekNext(-1)) return !0;
+                                    var radixPos = $.inArray(opts.radixPoint, getBuffer());
+                                    if (-1 !== radixPos) {
+                                        for (var vp in vps) if (radixPos < vp && vps[vp].input !== getPlaceholder(vp)) return !1;
+                                        return !0;
+                                    }
+                                }
                             }
+                            return !1;
+                        }(selectedCaret.begin)) {
+                            var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
+                            caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
+                            break;
+                        }
 
-                          default:
-                            var clickPosition = selectedCaret.begin, lvclickPosition = getLastValidPosition(clickPosition, !0), lastPosition = seekNext(lvclickPosition);
-                            if (clickPosition < lastPosition) caret(input, isMask(clickPosition) || isMask(clickPosition - 1) ? clickPosition : seekNext(clickPosition)); else {
-                                var placeholder = getPlaceholder(lastPosition);
-                                ("" !== placeholder && getBuffer()[lastPosition] !== placeholder && !0 !== getTest(lastPosition).match.optionalQuantifier || !isMask(lastPosition) && getTest(lastPosition).match.def === placeholder) && (lastPosition = seekNext(lastPosition)), 
-                                caret(input, lastPosition);
-                            }
+                      default:
+                        var clickPosition = selectedCaret.begin, lvclickPosition = getLastValidPosition(clickPosition, !0), lastPosition = seekNext(lvclickPosition);
+                        if (clickPosition < lastPosition) caret(input, isMask(clickPosition) || isMask(clickPosition - 1) ? clickPosition : seekNext(clickPosition)); else {
+                            var placeholder = getPlaceholder(lastPosition);
+                            ("" !== placeholder && getBuffer()[lastPosition] !== placeholder && !0 !== getTest(lastPosition).match.optionalQuantifier || !isMask(lastPosition) && getTest(lastPosition).match.def === placeholder) && (lastPosition = seekNext(lastPosition)), 
+                            caret(input, lastPosition);
                         }
                     }
-                }, 0);
+                }
             },
             dblclickEvent: function(e) {
                 var input = this;

+ 1 - 1
dist/inputmask/inputmask.numeric.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/inputmask.phone.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/inputmask.regex.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/jquery.inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/phone-codes/phone-be.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/phone-codes/phone-nl.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/phone-codes/phone-ru.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/phone-codes/phone-uk.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 1 - 1
dist/inputmask/phone-codes/phone.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {

+ 37 - 42
dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 !function(factory) {
@@ -574,7 +574,7 @@
                 }), writeOut) {
                     var caretPos = undefined;
                     document.activeElement === input && result && (caretPos = opts.numericInput ? seekPrevious(result.forwardPosition) : result.forwardPosition), 
-                    writeBuffer(input, getBuffer(), caretPos, initiatingEvent || new $.Event("checkval"));
+                    writeBuffer(input, getBuffer(), caretPos, initiatingEvent || new $.Event("checkval"), initiatingEvent && "input" === initiatingEvent.type);
                 }
             }
             function unmaskedvalue(input) {
@@ -779,12 +779,10 @@
                                     break;
 
                                   case "click":
-                                    if (iemobile || iphone) {
-                                        var that = this, args = arguments;
-                                        return setTimeout(function() {
-                                            eventHandler.apply(that, args);
-                                        }, 0), !1;
-                                    }
+                                    var that = this, args = arguments;
+                                    return setTimeout(function() {
+                                        eventHandler.apply(that, args);
+                                    }, 0), !1;
                                 }
                                 var returnVal = eventHandler.apply(this, arguments);
                                 return !1 === returnVal && (e.preventDefault(), e.stopPropagation()), returnVal;
@@ -951,46 +949,43 @@
                     }
                 },
                 clickEvent: function(e, tabbed) {
-                    function doRadixFocus(clickPos) {
-                        if ("" !== opts.radixPoint) {
-                            var vps = getMaskSet().validPositions;
-                            if (vps[clickPos] === undefined || vps[clickPos].input === getPlaceholder(clickPos)) {
-                                if (clickPos < seekNext(-1)) return !0;
-                                var radixPos = $.inArray(opts.radixPoint, getBuffer());
-                                if (-1 !== radixPos) {
-                                    for (var vp in vps) if (radixPos < vp && vps[vp].input !== getPlaceholder(vp)) return !1;
-                                    return !0;
-                                }
-                            }
-                        }
-                        return !1;
-                    }
                     var input = this;
-                    setTimeout(function() {
-                        if (document.activeElement === input) {
-                            var selectedCaret = caret(input);
-                            if (tabbed && (isRTL ? selectedCaret.end = selectedCaret.begin : selectedCaret.begin = selectedCaret.end), 
-                            selectedCaret.begin === selectedCaret.end) switch (opts.positionCaretOnClick) {
-                              case "none":
-                                break;
+                    if (document.activeElement === input) {
+                        var selectedCaret = caret(input);
+                        if (tabbed && (isRTL ? selectedCaret.end = selectedCaret.begin : selectedCaret.begin = selectedCaret.end), 
+                        selectedCaret.begin === selectedCaret.end) switch (opts.positionCaretOnClick) {
+                          case "none":
+                            break;
 
-                              case "radixFocus":
-                                if (doRadixFocus(selectedCaret.begin)) {
-                                    var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
-                                    caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
-                                    break;
+                          case "radixFocus":
+                            if (function(clickPos) {
+                                if ("" !== opts.radixPoint) {
+                                    var vps = getMaskSet().validPositions;
+                                    if (vps[clickPos] === undefined || vps[clickPos].input === getPlaceholder(clickPos)) {
+                                        if (clickPos < seekNext(-1)) return !0;
+                                        var radixPos = $.inArray(opts.radixPoint, getBuffer());
+                                        if (-1 !== radixPos) {
+                                            for (var vp in vps) if (radixPos < vp && vps[vp].input !== getPlaceholder(vp)) return !1;
+                                            return !0;
+                                        }
+                                    }
                                 }
+                                return !1;
+                            }(selectedCaret.begin)) {
+                                var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
+                                caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
+                                break;
+                            }
 
-                              default:
-                                var clickPosition = selectedCaret.begin, lvclickPosition = getLastValidPosition(clickPosition, !0), lastPosition = seekNext(lvclickPosition);
-                                if (clickPosition < lastPosition) caret(input, isMask(clickPosition) || isMask(clickPosition - 1) ? clickPosition : seekNext(clickPosition)); else {
-                                    var placeholder = getPlaceholder(lastPosition);
-                                    ("" !== placeholder && getBuffer()[lastPosition] !== placeholder && !0 !== getTest(lastPosition).match.optionalQuantifier || !isMask(lastPosition) && getTest(lastPosition).match.def === placeholder) && (lastPosition = seekNext(lastPosition)), 
-                                    caret(input, lastPosition);
-                                }
+                          default:
+                            var clickPosition = selectedCaret.begin, lvclickPosition = getLastValidPosition(clickPosition, !0), lastPosition = seekNext(lvclickPosition);
+                            if (clickPosition < lastPosition) caret(input, isMask(clickPosition) || isMask(clickPosition - 1) ? clickPosition : seekNext(clickPosition)); else {
+                                var placeholder = getPlaceholder(lastPosition);
+                                ("" !== placeholder && getBuffer()[lastPosition] !== placeholder && !0 !== getTest(lastPosition).match.optionalQuantifier || !isMask(lastPosition) && getTest(lastPosition).match.def === placeholder) && (lastPosition = seekNext(lastPosition)), 
+                                caret(input, lastPosition);
                             }
                         }
-                    }, 0);
+                    }
                 },
                 dblclickEvent: function(e) {
                     var input = this;

ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/bindings/inputmask.binding.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.min.js


+ 1 - 1
dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.min.js

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

ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.min.js


+ 1 - 1
dist/min/inputmask/global/document.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 "function"==typeof define&&define.amd?define(function(){return document}):"object"==typeof exports&&(module.exports=document);

+ 1 - 1
dist/min/inputmask/global/window.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.5-222
+* Version: 3.3.5-223
 */
 
 "function"==typeof define&&define.amd?define(function(){return window}):"object"==typeof exports&&(module.exports=window);

ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.date.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.extensions.min.js


ファイルの差分が大きいため隠しています
+ 3 - 3
dist/min/inputmask/inputmask.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.numeric.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.phone.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.regex.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/jquery.inputmask.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/phone-codes/phone-be.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/phone-codes/phone-nl.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/phone-codes/phone-ru.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/phone-codes/phone-uk.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/phone-codes/phone.min.js


ファイルの差分が大きいため隠しています
+ 4 - 4
dist/min/jquery.inputmask.bundle.min.js


+ 1 - 0
index.html

@@ -9,6 +9,7 @@
 <br/>
 <script type="text/javascript" src="build/bundle.js" charset="utf-8"></script>
 <script>
+	console.log(navigator.userAgent);
 	Inputmask("currency", {
 	    colorMask: true
 	}).mask("test1");

+ 37 - 43
js/inputmask.js

@@ -1906,7 +1906,7 @@
 					caretPos = opts.numericInput ? seekPrevious(result.forwardPosition) : result.forwardPosition;
 				}
 
-				writeBuffer(input, getBuffer(), caretPos, initiatingEvent || new $.Event("checkval"));
+				writeBuffer(input, getBuffer(), caretPos, initiatingEvent || new $.Event("checkval"), initiatingEvent && initiatingEvent.type === "input");
 			}
 		}
 
@@ -2176,7 +2176,7 @@
 								skipKeyPressEvent = true;
 								break;
 							case "click":
-								if (iemobile || iphone) {
+								if (iemobile || iphone || true) {  //needed for Chrome ~ initial selection clears after the clickevent
 									var that = this, args = arguments;
 									setTimeout(function () {
 										eventHandler.apply(that, args);
@@ -2569,52 +2569,48 @@
 				}
 
 				var input = this;
-				setTimeout(function () { //needed for Chrome ~ initial selection clears after the clickevent
-					if (document.activeElement === input) {
-						var selectedCaret = caret(input);
-						if (tabbed) {
-							if (isRTL)
-								selectedCaret.end = selectedCaret.begin;
-							else
-								selectedCaret.begin = selectedCaret.end;
-						}
-						if (selectedCaret.begin === selectedCaret.end) {
-							switch (opts.positionCaretOnClick) {
-								case "none":
+				if (document.activeElement === input) {
+					var selectedCaret = caret(input);
+					if (tabbed) {
+						if (isRTL)
+							selectedCaret.end = selectedCaret.begin;
+						else
+							selectedCaret.begin = selectedCaret.end;
+					}
+					if (selectedCaret.begin === selectedCaret.end) {
+						switch (opts.positionCaretOnClick) {
+							case "none":
+								break;
+							case "radixFocus":
+								if (doRadixFocus(selectedCaret.begin)) {
+									var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
+									caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
 									break;
-								case "radixFocus":
-									if (doRadixFocus(selectedCaret.begin)) {
-										var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
-										caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
-										break;
-									}
-								default: //lvp:
-									var clickPosition = selectedCaret.begin,
-										lvclickPosition = getLastValidPosition(clickPosition, true),
-										lastPosition = seekNext(lvclickPosition);
-									if (clickPosition < lastPosition) {
-										caret(input, !isMask(clickPosition) && !isMask(clickPosition - 1) ? seekNext(clickPosition) : clickPosition);
-									} else {
-										var placeholder = getPlaceholder(lastPosition);
-										if ((placeholder !== "" && getBuffer()[lastPosition] !== placeholder && getTest(lastPosition).match.optionalQuantifier !== true) || (!isMask(lastPosition) && getTest(lastPosition).match.def === placeholder)) {
-											lastPosition = seekNext(lastPosition);
-										}
-										caret(input, lastPosition);
+								}
+							default: //lvp:
+								var clickPosition = selectedCaret.begin,
+									lvclickPosition = getLastValidPosition(clickPosition, true),
+									lastPosition = seekNext(lvclickPosition);
+								if (clickPosition < lastPosition) {
+									caret(input, !isMask(clickPosition) && !isMask(clickPosition - 1) ? seekNext(clickPosition) : clickPosition);
+								} else {
+									var placeholder = getPlaceholder(lastPosition);
+									if ((placeholder !== "" && getBuffer()[lastPosition] !== placeholder && getTest(lastPosition).match.optionalQuantifier !== true) || (!isMask(lastPosition) && getTest(lastPosition).match.def === placeholder)) {
+										lastPosition = seekNext(lastPosition);
 									}
-									break;
-							}
+									caret(input, lastPosition);
+								}
+								break;
 						}
 					}
-				}, 0);
-			}
-			,
+				}
+			},
 			dblclickEvent: function (e) {
 				var input = this;
 				setTimeout(function () {
 					caret(input, 0, seekNext(getLastValidPosition()));
 				}, 0);
-			}
-			,
+			},
 			cutEvent: function (e) {
 				var input = this,
 					$input = $(input),
@@ -2633,8 +2629,7 @@
 				if (input.inputmask._valueGet() === getBufferTemplate().join("")) {
 					$input.trigger("cleared");
 				}
-			}
-			,
+			},
 			blurEvent: function (e) {
 				var $input = $(this),
 					input = this;
@@ -2672,8 +2667,7 @@
 						writeBuffer(input, buffer, undefined, e);
 					}
 				}
-			}
-			,
+			},
 			mouseenterEvent: function (e) {
 				var input = this;
 				mouseEnter = true;

+ 5 - 5
nuspecs/jquery.inputmask.linux.nuspec

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>jQuery.InputMask</id>
+    <id>InputMask</id>
     <version>0.0.0</version>
-    <title>jQuery Input Mask</title>
+    <title>Inputmask</title>
     <authors>Robin Herbots</authors>
     <owners>Robin Herbots</owners>
     <licenseUrl>http://opensource.org/licenses/mit-license.php</licenseUrl>
-    <projectUrl>https://github.com/RobinHerbots/jquery.inputmask</projectRUrl>
+    <projectUrl>https://github.com/RobinHerbots/Inputmask</projectRUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <summary>jquery.inputmask is a jquery plugin which create an input mask.</summary>
-    <description>jquery.inputmask is a jquery plugin which create an input mask.</description>
+    <summary>Inputmask is a jquery plugin which create an input mask.</summary>
+    <description>Inputmask is a jquery plugin which create an input mask.</description>
     <tags>jQuery, plugins, input, form, inputmask, mask</tags>
   </metadata>
   <files>

+ 5 - 5
nuspecs/jquery.inputmask.nuspec

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>jQuery.InputMask</id>
+    <id>InputMask</id>
     <version>0.0.0</version>
-    <title>jQuery Input Mask</title>
+    <title>Inputmask</title>
     <authors>Robin Herbots</authors>
     <owners>Robin Herbots</owners>
     <licenseUrl>http://opensource.org/licenses/mit-license.php</licenseUrl>
-    <projectUrl>https://github.com/RobinHerbots/jquery.inputmask</projectUrl>
+    <projectUrl>https://github.com/RobinHerbots/Inputmask</projectUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <summary>jquery.inputmask is a jquery plugin which create an input mask.</summary>
-    <description>jquery.inputmask is a jquery plugin which create an input mask.</description>
+    <summary>Inputmask is a jquery plugin which create an input mask.</summary>
+    <description>Inputmask is a jquery plugin which create an input mask.</description>
     <tags>jQuery, plugins, input, form, inputmask, mask</tags>
   </metadata>
   <files>

+ 1 - 1
nuspecs/Readme.txt

@@ -1,7 +1,7 @@
 ## .NET Nuget Package Install
 
 ```html
-PM> Install-Package jQuery.InputMask
+PM> Install-Package InputMask
 ```
 
 In App_Start, BundleConfig.cs

+ 6 - 6
package.json

@@ -1,7 +1,7 @@
 {
-  "name": "jquery.inputmask",
-  "version": "3.3.5-222",
-  "description": "jquery.inputmask is a jquery plugin which create an input mask.",
+  "name": "Inputmask",
+  "version": "3.3.5-223",
+  "description": "Inputmask is a jquery plugin which create an input mask.",
   "main": "index.js",
   "files": [
     "dist/",
@@ -14,7 +14,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/RobinHerbots/jquery.inputmask.git"
+    "url": "https://github.com/RobinHerbots/Inputmask.git"
   },
   "keywords": [
     "form",
@@ -31,9 +31,9 @@
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/RobinHerbots/jquery.inputmask/issues"
+    "url": "https://github.com/RobinHerbots/Inputmask/issues"
   },
-  "homepage": "https://github.com/RobinHerbots/jquery.inputmask",
+  "homepage": "https://github.com/RobinHerbots/Inputmask",
   "devDependencies": {
     "babel-core": "^6.0.0",
     "babel-loader": "^6.2.4",