ソースを参照

fix multi oncompletes on paste #303

Robin Herbots 12 年 前
コミット
0ca99c994f

+ 1 - 1
build.properties

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

+ 1 - 1
component.json

@@ -1,6 +1,6 @@
 {
     "name": "jquery.inputmask",
-    "version": "2.3.12",
+    "version": "2.3.13",
     "main": "./dist/jquery.inputmask.bundle.js",
     "dependencies": {
         "jquery": ">=1.5"

BIN
dist/jQuery.InputMask.2.3.12.nupkg


BIN
dist/jQuery.InputMask.2.3.13.nupkg


+ 11 - 9
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.3.12
+* Version: 2.3.13
 */
 
 (function ($) {
@@ -1470,10 +1470,12 @@
                                         if (getActiveMaskSet()["writeOutBuffer"] && result["result"] !== false) {
                                             var buffer = getActiveBuffer();
                                             writeBuffer(input, buffer, checkval ? undefined : ((opts.numericInput && isRTL) ? seekNext(getActiveMaskSet()["p"]) : getActiveMaskSet()["p"]));
-                                            setTimeout(function () { //timeout needed for IE
-                                                if (isComplete(buffer))
-                                                    $input.trigger("complete");
-                                            }, 0);
+                                            if (checkval !== true) {
+                                                setTimeout(function() { //timeout needed for IE
+                                                    if (isComplete(buffer))
+                                                        $input.trigger("complete");
+                                                }, 0);
+                                            }
                                         } else if (isSelection) {
                                             getActiveMaskSet()["buffer"] = getActiveMaskSet()["undoBuffer"].split('');
                                         }
@@ -1512,7 +1514,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.3.12
+Version: 2.3.13
 
 Optional extensions on the jquery.inputmask base
 */
@@ -1614,7 +1616,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.3.12
+Version: 2.3.13
 
 Optional extensions on the jquery.inputmask base
 */
@@ -2091,7 +2093,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.3.12
+Version: 2.3.13
 
 Optional extensions on the jquery.inputmask base
 */
@@ -2258,7 +2260,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.3.12
+Version: 2.3.13
 
 Regex extensions on the jquery.inputmask base
 Allows for using regular expressions as a mask

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


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


+ 1 - 1
jquery.inputmask.jquery.json

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

+ 6 - 4
js/jquery.inputmask.js

@@ -1470,10 +1470,12 @@
                                         if (getActiveMaskSet()["writeOutBuffer"] && result["result"] !== false) {
                                             var buffer = getActiveBuffer();
                                             writeBuffer(input, buffer, checkval ? undefined : ((opts.numericInput && isRTL) ? seekNext(getActiveMaskSet()["p"]) : getActiveMaskSet()["p"]));
-                                            setTimeout(function () { //timeout needed for IE
-                                                if (isComplete(buffer))
-                                                    $input.trigger("complete");
-                                            }, 0);
+                                            if (checkval !== true) {
+                                                setTimeout(function() { //timeout needed for IE
+                                                    if (isComplete(buffer))
+                                                        $input.trigger("complete");
+                                                }, 0);
+                                            }
                                         } else if (isSelection) {
                                             getActiveMaskSet()["buffer"] = getActiveMaskSet()["undoBuffer"].split('');
                                         }