Merge branch '1.x' into 2.x

build.properties

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

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.7
+* Version: 2.1.8
 */
 
 (function ($) {
@@ -646,7 +646,7 @@
                     var buffer = getActiveBuffer().slice();
                     checkVal(input, buffer);
                     return $.map(buffer, function (element, index) {
-                        return isMask(index) && element != getBufferElement(getActiveBuffer().slice(), index) ? element : null;
+                        return isMask(index) && isValid(index, element, buffer, true) ? element : null;
                     }).join('');
                 }
                 else {
@@ -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.7
+Version: 2.1.8
 
 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.7
+Version: 2.1.8
 
 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.7
+Version: 2.1.8
 
 Optional extensions on the jquery.inputmask base
 */
@@ -2008,4 +2008,4 @@ Optional extensions on the jquery.inputmask base
             alias: "decimal"
         }
     });
-})(jQuery);
+})(jQuery);

jquery.inputmask.jquery.json

@@ -8,11 +8,7 @@
 		"inputmask",
 		"mask"
     ],
-<<<<<<< HEAD
-    "version": "2.1.7"
-=======
-    "version": "2.1.7"
->>>>>>> 1.x
+    "version": "2.1.8"
     "author": {
         "name": "Robin Herbots",
         "url": "http://github.com/RobinHerbots/jquery.inputmask"

js/jquery.inputmask.js

@@ -646,7 +646,7 @@
                     var buffer = getActiveBuffer().slice();
                     checkVal(input, buffer);
                     return $.map(buffer, function (element, index) {
-                        return isMask(index) && element != getBufferElement(getActiveBuffer().slice(), index) ? element : null;
+                        return isMask(index) && isValid(index, element, buffer, true) ? element : null;
                     }).join('');
                 }
                 else {

js/jquery.inputmask.numeric.extensions.js

@@ -157,4 +157,4 @@ Optional extensions on the jquery.inputmask base
             alias: "decimal"
         }
     });
-})(jQuery);
+})(jQuery);