Merge branch '2.x' into 2.6

build.properties

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

jquery.inputmask.jquery.json

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

js/jquery.inputmask.js

@@ -832,7 +832,7 @@
                 if (typeof begin == 'number') {
                     begin = TranslatePosition(begin);
                     end = TranslatePosition(end);
-                    if (!$(input).is(':visible')) {
+                    if (!$(npt).is(':visible')) {
                         return;
                     }
                     end = (typeof end == 'number') ? end : begin;
@@ -1366,12 +1366,12 @@
             }
 
             function pasteEvent(e) {
-                if (skipInputEvent === true) {
+                if (skipInputEvent === true && e.type == "input") {
                     skipInputEvent = false;
                     return true;
                 }
-                var input = this, $input = $(input);
 
+                var input = this, $input = $(input);
                 //paste event for IE8 and lower I guess ;-)
                 if (e.type == "propertychange" && input._valueGet().length <= getMaskLength()) {
                     return true;
@@ -1582,7 +1582,6 @@
                          ).bind("keypress.inputmask", keypressEvent
                          ).bind("keyup.inputmask", keyupEvent);
 
-
                     if (android) {
                         if (androidchrome) {
                             $el.bind("input.inputmask", mobileInputEvent);
@@ -1596,6 +1595,7 @@
                         }
                         $el.bind("input.inputmask", mobileInputEvent);
                     }
+
                     if (msie1x)
                         $el.bind("input.inputmask", pasteEvent);