ソースを参照

ugly fix for IE10 input clear button (X)

Robin Herbots 12 年 前
コミット
312d677f64

+ 1 - 1
build.properties

@@ -7,7 +7,7 @@ distdir = dist
 
 build.major = 2
 build.minor = 2
-build.revision = 37
+build.revision = 38
 
 target = jquery.inputmask.bundle.js
 target.min = jquery.inputmask.bundle.min.js

BIN
dist/jQuery.InputMask.2.2.37.nupkg


BIN
dist/jQuery.InputMask.2.2.38.nupkg


+ 9 - 8
dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2013 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 2.2.37
+* Version: 2.2.38
 */
 
 (function ($) {
@@ -78,9 +78,10 @@
 
         $.fn.inputmask = function (fn, options) {
             var opts = $.extend(true, {}, $.inputmask.defaults, options),
-                pasteEvent = isInputEventSupported('paste') ? 'paste' : 'input',
-                iphone = navigator.userAgent.match(/iphone/i) != null,
-                android = navigator.userAgent.match(/android.*safari.*/i) != null,
+                msie10 = navigator.userAgent.match(new RegExp("msie 10", "i")) !== null,
+                iphone = navigator.userAgent.match(new RegExp("iphone", "i")) !== null,
+                android = navigator.userAgent.match(new RegExp("android.*safari.*", "i")) !== null,
+                pasteEvent = isInputEventSupported('paste') && !msie10 ? 'paste' : 'input',
                 android533,
                 masksets,
                 activeMasksetIndex = 0;
@@ -1464,7 +1465,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2013 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.2.37
+Version: 2.2.38
 
 Optional extensions on the jquery.inputmask base
 */
@@ -1561,7 +1562,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2012 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.2.37
+Version: 2.2.38
 
 Optional extensions on the jquery.inputmask base
 */
@@ -2054,7 +2055,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2013 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.2.37
+Version: 2.2.38
 
 Optional extensions on the jquery.inputmask base
 */
@@ -2216,7 +2217,7 @@ Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2013 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 2.2.37
+Version: 2.2.38
 
 Regex extensions on the jquery.inputmask base
 Allows for using regular expressions as a mask

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


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


+ 1 - 1
jquery.inputmask.jquery.json

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

+ 4 - 3
js/jquery.inputmask.js

@@ -78,9 +78,10 @@
 
         $.fn.inputmask = function (fn, options) {
             var opts = $.extend(true, {}, $.inputmask.defaults, options),
-                pasteEvent = isInputEventSupported('paste') ? 'paste' : 'input',
-                iphone = navigator.userAgent.match(/iphone/i) != null,
-                android = navigator.userAgent.match(/android.*safari.*/i) != null,
+                msie10 = navigator.userAgent.match(new RegExp("msie 10", "i")) !== null,
+                iphone = navigator.userAgent.match(new RegExp("iphone", "i")) !== null,
+                android = navigator.userAgent.match(new RegExp("android.*safari.*", "i")) !== null,
+                pasteEvent = isInputEventSupported('paste') && !msie10 ? 'paste' : 'input',
                 android533,
                 masksets,
                 activeMasksetIndex = 0;