Merge branch '1.x' into 2.x

build.properties

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

build.xml

@@ -14,7 +14,7 @@
 	   <replaceregexp file="${srcdir}/jquery.inputmask.extensions.js" match="Version:.*" replace="Version: ${build.major}.${build.minor}.${build.revision}"  byline="true"/>
 	   <replaceregexp file="${srcdir}/jquery.inputmask.date.extensions.js" match="Version:.*" replace="Version: ${build.major}.${build.minor}.${build.revision}"  byline="true"/>
 	   <replaceregexp file="${srcdir}/jquery.inputmask.numeric.extensions.js" match="Version:.*" replace="Version: ${build.major}.${build.minor}.${build.revision}"  byline="true"/>
-	   <replaceregexp file="./jquery.inputmask.jquery.json" match="&quot;version&quot;:.*" replace="&quot;version&quot;: &quot;${build.major}.${build.minor}.${build.revision}&quot;"  byline="true"/>
+	   <replaceregexp file="./jquery.inputmask.jquery.json" match="&quot;version&quot;:.*" replace="&quot;version&quot;: &quot;${build.major}.${build.minor}.${build.revision}&quot;,"  byline="true"/>
 	</target>
 
 	<target name="resetVersions">

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.1.8
+* Version: 2.1.9
 */
 
 (function ($) {
@@ -79,11 +79,11 @@
 
             var iphone = navigator.userAgent.match(/iphone/i) != null;
             var android = navigator.userAgent.match(/android.*mobile safari.*/i) != null;
-            if (android) {
-                var browser = navigator.userAgent.match(/mobile safari.*/i);
-                var version = parseInt(new RegExp(/[0-9]+/).exec(browser));
-                android = version <= 533;
-            }
+            //if (android) {
+            //    var browser = navigator.userAgent.match(/mobile safari.*/i);
+            //    var version = parseInt(new RegExp(/[0-9]+/).exec(browser));
+            //    android = version <= 533;
+            //}
             var caretposCorrection = null;
             var masksets,
 	        activeMasksetIndex = 0;
@@ -1264,7 +1264,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.1.8
+Version: 2.1.9
 
 Optional extensions on the jquery.inputmask base
 */
@@ -1361,7 +1361,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.1.8
+Version: 2.1.9
 
 Optional extensions on the jquery.inputmask base
 */
@@ -1854,7 +1854,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.1.8
+Version: 2.1.9
 
 Optional extensions on the jquery.inputmask base
 */

jquery.inputmask.jquery.json

@@ -8,7 +8,7 @@
 		"inputmask",
 		"mask"
     ],
-    "version": "2.1.8"
+    "version": "2.1.9",
     "author": {
         "name": "Robin Herbots",
         "url": "http://github.com/RobinHerbots/jquery.inputmask"
@@ -26,4 +26,4 @@
     "dependencies": {
         "jquery": ">=1.5"
     }
-}
+}

js/jquery.inputmask.js

@@ -79,11 +79,11 @@
 
             var iphone = navigator.userAgent.match(/iphone/i) != null;
             var android = navigator.userAgent.match(/android.*mobile safari.*/i) != null;
-            if (android) {
-                var browser = navigator.userAgent.match(/mobile safari.*/i);
-                var version = parseInt(new RegExp(/[0-9]+/).exec(browser));
-                android = version <= 533;
-            }
+            //if (android) {
+            //    var browser = navigator.userAgent.match(/mobile safari.*/i);
+            //    var version = parseInt(new RegExp(/[0-9]+/).exec(browser));
+            //    android = version <= 533;
+            //}
             var caretposCorrection = null;
             var masksets,
 	        activeMasksetIndex = 0;