suffix bug fix #1558

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "3.3.6-0",
+  "version": "3.3.6-2",
   "main": [
 	  "./dist/inputmask/inputmask.js",
 	  "./dist/inputmask/inputmask.extensions.js",

component.json

@@ -2,7 +2,7 @@
 	"name": "inputmask",
 	"repository": "robinherbots/Inputmask",
 	"description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
-	"version": "3.3.6-0",
+	"version": "3.3.6-2",
 	"keywords": [
 		"jquery",
 		"plugins",

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "robinherbots/inputmask",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
-  "version": "3.3.6-0",
+  "version": "3.3.6-2",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "homepage": "http://robinherbots.github.io/Inputmask",

dist/inputmask/bindings/inputmask.binding.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/global/document.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 "function" == typeof define && define.amd ? define(function() {

dist/inputmask/global/window.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 "function" == typeof define && define.amd ? define(function() {

dist/inputmask/inputmask.date.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/inputmask.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {
@@ -780,10 +780,12 @@
                                 break;
 
                               case "click":
-                                var that = this, args = arguments;
-                                return setTimeout(function() {
-                                    eventHandler.apply(that, args);
-                                }, 0), !1;
+                                if (iemobile || iphone) {
+                                    var that = this, args = arguments;
+                                    return setTimeout(function() {
+                                        eventHandler.apply(that, args);
+                                    }, 0), !1;
+                                }
                             }
                             var returnVal = eventHandler.apply(this, arguments);
                             return !1 === returnVal && (e.preventDefault(), e.stopPropagation()), returnVal;
@@ -950,43 +952,46 @@
                 }
             },
             clickEvent: function(e, tabbed) {
+                function doRadixFocus(clickPos) {
+                    if ("" !== opts.radixPoint) {
+                        var vps = getMaskSet().validPositions;
+                        if (vps[clickPos] === undefined || vps[clickPos].input === getPlaceholder(clickPos)) {
+                            if (clickPos < seekNext(-1)) return !0;
+                            var radixPos = $.inArray(opts.radixPoint, getBuffer());
+                            if (-1 !== radixPos) {
+                                for (var vp in vps) if (radixPos < vp && vps[vp].input !== getPlaceholder(vp)) return !1;
+                                return !0;
+                            }
+                        }
+                    }
+                    return !1;
+                }
                 var input = this;
-                if (document.activeElement === input) {
-                    var selectedCaret = caret(input);
-                    if (tabbed && (isRTL ? selectedCaret.end = selectedCaret.begin : selectedCaret.begin = selectedCaret.end), 
-                    selectedCaret.begin === selectedCaret.end) switch (opts.positionCaretOnClick) {
-                      case "none":
-                        break;
+                setTimeout(function() {
+                    if (document.activeElement === input) {
+                        var selectedCaret = caret(input);
+                        if (tabbed && (isRTL ? selectedCaret.end = selectedCaret.begin : selectedCaret.begin = selectedCaret.end), 
+                        selectedCaret.begin === selectedCaret.end) switch (opts.positionCaretOnClick) {
+                          case "none":
+                            break;
 
-                      case "radixFocus":
-                        if (function(clickPos) {
-                            if ("" !== opts.radixPoint) {
-                                var vps = getMaskSet().validPositions;
-                                if (vps[clickPos] === undefined || vps[clickPos].input === getPlaceholder(clickPos)) {
-                                    if (clickPos < seekNext(-1)) return !0;
-                                    var radixPos = $.inArray(opts.radixPoint, getBuffer());
-                                    if (-1 !== radixPos) {
-                                        for (var vp in vps) if (radixPos < vp && vps[vp].input !== getPlaceholder(vp)) return !1;
-                                        return !0;
-                                    }
-                                }
+                          case "radixFocus":
+                            if (doRadixFocus(selectedCaret.begin)) {
+                                var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
+                                caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
+                                break;
                             }
-                            return !1;
-                        }(selectedCaret.begin)) {
-                            var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
-                            caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
-                            break;
-                        }
 
-                      default:
-                        var clickPosition = selectedCaret.begin, lvclickPosition = getLastValidPosition(clickPosition, !0), lastPosition = seekNext(lvclickPosition);
-                        if (clickPosition < lastPosition) caret(input, isMask(clickPosition) || isMask(clickPosition - 1) ? clickPosition : seekNext(clickPosition)); else {
-                            var placeholder = getPlaceholder(lastPosition);
-                            ("" !== placeholder && getBuffer()[lastPosition] !== placeholder && !0 !== getTest(lastPosition).match.optionalQuantifier || !isMask(lastPosition) && getTest(lastPosition).match.def === placeholder) && (lastPosition = seekNext(lastPosition)), 
-                            caret(input, lastPosition);
+                          default:
+                            var clickPosition = selectedCaret.begin, lvclickPosition = getLastValidPosition(clickPosition, !0), lastPosition = seekNext(lvclickPosition);
+                            if (clickPosition < lastPosition) caret(input, isMask(clickPosition) || isMask(clickPosition - 1) ? clickPosition : seekNext(clickPosition)); else {
+                                var placeholder = getPlaceholder(lastPosition);
+                                ("" !== placeholder && getBuffer()[lastPosition] !== placeholder && !0 !== getTest(lastPosition).match.optionalQuantifier || !isMask(lastPosition) && getTest(lastPosition).match.def === placeholder) && (lastPosition = seekNext(lastPosition)), 
+                                caret(input, lastPosition);
+                            }
                         }
                     }
-                }
+                }, 0);
             },
             dblclickEvent: function(e) {
                 var input = this;

dist/inputmask/inputmask.phone.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/inputmask.regex.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/jquery.inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-be.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-nl.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-ru.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-uk.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(factory) {

dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 !function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):window.dependencyLib=a(jQuery)}(function(a){return a});

dist/min/inputmask/global/document.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 "function"==typeof define&&define.amd?define(function(){return document}):"object"==typeof exports&&(module.exports=document);

dist/min/inputmask/global/window.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.6-0
+* Version: 3.3.6-2
 */
 
 "function"==typeof define&&define.amd?define(function(){return window}):"object"==typeof exports&&(module.exports=window);

js/inputmask.js

@@ -2176,7 +2176,7 @@
 								skipKeyPressEvent = true;
 								break;
 							case "click":
-								if (iemobile || iphone || true) {  //needed for Chrome ~ initial selection clears after the clickevent
+								if (iemobile || iphone) {
 									var that = this, args = arguments;
 									setTimeout(function () {
 										eventHandler.apply(that, args);
@@ -2569,42 +2569,45 @@
 				}
 
 				var input = this;
-				if (document.activeElement === input) {
-					var selectedCaret = caret(input);
-					if (tabbed) {
-						if (isRTL)
-							selectedCaret.end = selectedCaret.begin;
-						else
-							selectedCaret.begin = selectedCaret.end;
-					}
-					if (selectedCaret.begin === selectedCaret.end) {
-						switch (opts.positionCaretOnClick) {
-							case "none":
-								break;
-							case "radixFocus":
-								if (doRadixFocus(selectedCaret.begin)) {
-									var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
-									caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
+				setTimeout(function () { //needed for Chrome ~ initial selection clears after the clickevent
+					if (document.activeElement === input) {
+						var selectedCaret = caret(input);
+						if (tabbed) {
+							if (isRTL)
+								selectedCaret.end = selectedCaret.begin;
+							else
+								selectedCaret.begin = selectedCaret.end;
+						}
+						if (selectedCaret.begin === selectedCaret.end) {
+							switch (opts.positionCaretOnClick) {
+								case "none":
 									break;
-								}
-							default: //lvp:
-								var clickPosition = selectedCaret.begin,
-									lvclickPosition = getLastValidPosition(clickPosition, true),
-									lastPosition = seekNext(lvclickPosition);
-								if (clickPosition < lastPosition) {
-									caret(input, !isMask(clickPosition) && !isMask(clickPosition - 1) ? seekNext(clickPosition) : clickPosition);
-								} else {
-									var placeholder = getPlaceholder(lastPosition);
-									if ((placeholder !== "" && getBuffer()[lastPosition] !== placeholder && getTest(lastPosition).match.optionalQuantifier !== true) || (!isMask(lastPosition) && getTest(lastPosition).match.def === placeholder)) {
-										lastPosition = seekNext(lastPosition);
+								case "radixFocus":
+									if (doRadixFocus(selectedCaret.begin)) {
+										var radixPos = getBuffer().join("").indexOf(opts.radixPoint);
+										caret(input, opts.numericInput ? seekNext(radixPos) : radixPos);
+										break;
 									}
-									caret(input, lastPosition);
-								}
-								break;
+								default: //lvp:
+									var clickPosition = selectedCaret.begin,
+										lvclickPosition = getLastValidPosition(clickPosition, true),
+										lastPosition = seekNext(lvclickPosition);
+									if (clickPosition < lastPosition) {
+										caret(input, !isMask(clickPosition) && !isMask(clickPosition - 1) ? seekNext(clickPosition) : clickPosition);
+									} else {
+										var placeholder = getPlaceholder(lastPosition);
+										if ((placeholder !== "" && getBuffer()[lastPosition] !== placeholder && getTest(lastPosition).match.optionalQuantifier !== true) || (!isMask(lastPosition) && getTest(lastPosition).match.def === placeholder)) {
+											lastPosition = seekNext(lastPosition);
+										}
+										caret(input, lastPosition);
+									}
+									break;
+							}
 						}
 					}
-				}
-			},
+				}, 0);
+			}
+			,
 			dblclickEvent: function (e) {
 				var input = this;
 				setTimeout(function () {

js/inputmask.numeric.extensions.js

@@ -20,7 +20,8 @@
 	function autoEscape(txt, opts) {
 		var escapedTxt = "";
 		for (var i = 0; i < txt.length; i++) {
-			if (opts.definitions[txt.charAt(i)] ||
+			if (Inputmask.prototype.definitions[txt.charAt(i)] ||
+				opts.definitions[txt.charAt(i)] ||
 				opts.optionalmarker.start === txt.charAt(i) ||
 				opts.optionalmarker.end === txt.charAt(i) ||
 				opts.quantifiermarker.start === txt.charAt(i) ||
@@ -612,7 +613,6 @@
 			suffix: " %",
 			allowMinus: false
 		}
-	})
-	;
+	});
 	return Inputmask;
 }));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "3.3.6-0",
+  "version": "3.3.6-2",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
   "main": "index.js",
   "files": [

qunit/tests_numeric.js

@@ -1985,4 +1985,21 @@ define([
 
 		assert.equal(testmask.inputmask._valueGet(), "$ 100,00", "Result " + testmask.inputmask._valueGet());
 	});
+
+	qunit.test("decimal suffix: years => yers - marcelokohl", function (assert) {
+		var $fixture = $("#qunit-fixture");
+		$fixture.append('<input type="text" id="testmask" />');
+		var testmask = document.getElementById("testmask");
+		Inputmask('decimal', {
+			suffix:" years",
+			rightAlign: false,
+			onBeforeMask: function (value, opts) {
+				return value;
+			}
+		}).mask(testmask);
+
+		$(testmask).val("1");
+
+		assert.equal(testmask.inputmask._valueGet(), "1 years", "Result " + testmask.inputmask._valueGet());
+	});
 });