fix ctrlz

RobinHerbots · RobinHerbots · commit cf7d0637a754 · 2021-03-25T19:30:48.000+01:00
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "5.0.6-beta.51",
+  "version": "5.0.6-beta.52",
   "main": [
 	  "./index.js",
     "./css/inputmask.css"
diff --git a/composer.json b/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": "5.0.6-beta.51",
+  "version": "5.0.6-beta.52",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "homepage": "http://robinherbots.github.io/Inputmask",
diff --git a/dist/inputmask.js b/dist/inputmask.js
diff --git a/dist/inputmask.min.js b/dist/inputmask.min.js
diff --git a/dist/jquery.inputmask.js b/dist/jquery.inputmask.js
diff --git a/dist/jquery.inputmask.min.js b/dist/jquery.inputmask.min.js
diff --git a/lib/defaults.js b/lib/defaults.js
@@ -1,3 +1,5 @@
+import keyCode from "./keycode.json";
+
 export default {
 	_maxTestPos: 500,
 	placeholder: "_",
@@ -49,7 +51,37 @@ export default {
 	tabThrough: false, //allows for tabbing through the different parts of the masked field
 	supportsInputType: ["text", "tel", "url", "password", "search"], //list with the supported input types
 	//specify keyCodes which should not be considered in the keypress event, otherwise the preventDefault will stop their default behavior especially in FF
-	ignorables: [8, 9, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40, 45, 46, 93, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 0, 229],
+	ignorables: [
+		keyCode.BACKSPACE,
+		keyCode.TAB,
+		keyCode["PAUSE/BREAK"],
+		keyCode.ESCAPE,
+		keyCode.PAGE_UP,
+		keyCode.PAGE_DOWN,
+		keyCode.END,
+		keyCode.HOME,
+		keyCode.LEFT,
+		keyCode.UP,
+		keyCode.RIGHT,
+		keyCode.DOWN,
+		keyCode.INSERT,
+		keyCode.DELETE,
+		93,
+		112,
+		113,
+		114,
+		115,
+		116,
+		117,
+		118,
+		119,
+		120,
+		121,
+		122,
+		123,
+		0,
+		229
+	],
 	isComplete: null, //override for isComplete - args => buffer, opts - return true || false
 	preValidation: null, //hook to preValidate the input.  Usefull for validating regardless the definition.	args => buffer, pos, char, isSelection, opts, maskset, caretPos, strict => return true/false/command object
 	postValidation: null, //hook to postValidate the result from isValid.	Usefull for validating the entry as a whole.	args => buffer, pos, c, currentResult, opts, maskset, strict, fromCheckval => return true/false/json
diff --git a/lib/eventhandlers.js b/lib/eventhandlers.js
@@ -100,8 +100,8 @@ var EventHandlers = {
 			k = e.which || e.charCode || e.keyCode;
 
 		if (checkval !== true && (!(e.ctrlKey && e.altKey) && (e.ctrlKey || e.metaKey || inputmask.ignorable))) {
-			if (k === keyCode.ENTER && inputmask.undoValue !== getBuffer.call(inputmask).join("")) {
-				inputmask.undoValue = getBuffer.call(inputmask).join("");
+			if (k === keyCode.ENTER && inputmask.undoValue !== inputmask._valueGet(true)) {
+				inputmask.undoValue = inputmask._valueGet(true);
 				// e.preventDefault();
 				setTimeout(function () {
 					$input.trigger("change");
@@ -192,7 +192,6 @@ var EventHandlers = {
 			}
 		}
 		checkVal(input, true, false, pasteValue.toString().split(""), e);
-		// writeBuffer(input, getBuffer(), seekNext(getLastValidPosition()), e, inputmask.undoValue !== getBuffer().join(""));
 
 		return e.preventDefault();
 	},
@@ -373,7 +372,7 @@ var EventHandlers = {
 		if (opts.positionCaretOnTab === true && inputmask.mouseEnter === false && (!isComplete.call(inputmask, getBuffer.call(inputmask)) || getLastValidPosition.call(inputmask) === -1)) {
 			EventHandlers.clickEvent.apply(input, [e, true]);
 		}
-		inputmask.undoValue = getBuffer.call(inputmask).join("");
+		inputmask.undoValue = inputmask._valueGet(true);
 	},
 	invalidEvent: function (e) {
 		this.inputmask.validationEvent = true;
@@ -411,7 +410,7 @@ var EventHandlers = {
 		if (document.execCommand) document.execCommand("copy"); // copy selected content to system clipbaord
 
 		handleRemove.call(inputmask, input, keyCode.DELETE, pos);
-		writeBuffer(input, getBuffer.call(inputmask), maskset.p, e, inputmask.undoValue !== getBuffer.call(inputmask).join(""));
+		writeBuffer(input, getBuffer.call(inputmask), maskset.p, e, inputmask.undoValue !== inputmask._valueGet(true));
 	}
 	,
 	blurEvent: function (e) {
@@ -450,8 +449,8 @@ var EventHandlers = {
 				writeBuffer(input, buffer, undefined, e);
 			}
 
-			if (inputmask.undoValue !== getBuffer.call(inputmask).join("")) {
-				inputmask.undoValue = getBuffer.call(inputmask).join("");
+			if (inputmask.undoValue !== inputmask._valueGet(true)) {
+				inputmask.undoValue = inputmask._valueGet(true);
 				$input.trigger("change");
 			}
 		}
@@ -476,7 +475,7 @@ var EventHandlers = {
 	submitEvent: function () { //trigger change on submit if any
 		const inputmask = this.inputmask, opts = inputmask.opts;
 
-		if (inputmask.undoValue !== getBuffer.call(inputmask).join("")) {
+		if (inputmask.undoValue !== inputmask._valueGet(true)) {
 			inputmask.$el.trigger("change");
 		}
 		if (opts.clearMaskOnLostFocus && getLastValidPosition.call(inputmask) === -1 && inputmask._valueGet && inputmask._valueGet() === getBufferTemplate.call(inputmask).join("")) {
diff --git a/lib/inputHandling.js b/lib/inputHandling.js
@@ -23,7 +23,7 @@ function applyInputValue(input, value) {
 	if (typeof opts.onBeforeMask === "function") value = opts.onBeforeMask.call(inputmask, value, opts) || value;
 	value = value.toString().split("");
 	checkVal(input, true, false, value);
-	inputmask.undoValue = getBuffer.call(inputmask).join("");
+	inputmask.undoValue = inputmask._valueGet(true);
 	if ((opts.clearMaskOnLostFocus || opts.clearIncomplete) && input.inputmask._valueGet() === getBufferTemplate.call(inputmask).join("") && getLastValidPosition.call(inputmask) === -1) {
 		input.inputmask._valueSet("");
 	}
@@ -146,7 +146,7 @@ function checkVal(input, writeOut, strict, nptvl, initiatingEvent) {
 		}
 	}
 	if (writeOut) {
-		writeBuffer.call(inputmask, input, getBuffer.call(inputmask), result ? result.forwardPosition : inputmask.caretPos.begin, initiatingEvent || new $.Event("checkval"), initiatingEvent && initiatingEvent.type === "input" && inputmask.undoValue !== getBuffer.call(inputmask).join(""));
+		writeBuffer.call(inputmask, input, getBuffer.call(inputmask), result ? result.forwardPosition : inputmask.caretPos.begin, initiatingEvent || new $.Event("checkval"), initiatingEvent && initiatingEvent.type === "input" && inputmask.undoValue !== inputmask._valueGet(true));
 		// for (var vndx in maskset.validPositions) {
 		// 	if (maskset.validPositions[vndx].match.generated !== true) { //only remove non forced generated
 		// 		delete maskset.validPositions[vndx].generatedInput; //clear generated markings ~ consider initializing with a  value as fully typed
diff --git a/lib/keycode.json b/lib/keycode.json
@@ -16,6 +16,10 @@
 	"TAB": 9,
 	"UP": 38,
 	"X": 88,
+	"Z": 90,
 	"CONTROL": 17,
+	"PAUSE/BREAK": 19,
+	"WINDOWS_LEFT": 91,
+	"WINDOWS_RIGHT": 92,
 	"KEY_229": 229
 }
diff --git a/lib/mask.js b/lib/mask.js
@@ -215,7 +215,8 @@ function mask() {
 		EventRuler.on(el, "setvalue", EventHandlers.setValueEvent);
 
 		//apply mask
-		inputmask.undoValue = getBufferTemplate.call(inputmask).join(""); //initialize the buffer and getmasklength
+		getBufferTemplate.call(inputmask).join(""); //initialize the buffer and getmasklength
+		inputmask.undoValue = inputmask._valueGet(true);
 		var activeElement = (el.inputmask.shadowRoot || el.ownerDocument).activeElement;
 		if (el.inputmask._valueGet(true) !== "" || opts.clearMaskOnLostFocus === false || activeElement === el) {
 			applyInputValue(el, el.inputmask._valueGet(true), opts);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "5.0.6-beta.51",
+  "version": "5.0.6-beta.52",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
   "main": "dist/inputmask.js",
   "files": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "inputmask",`
`3`		`- "version": "5.0.6-beta.51",`
	`3`	`+ "version": "5.0.6-beta.52",`
`4`	`4`	`"main": [`
`5`	`5`	`"./index.js",`
`6`	`6`	`"./css/inputmask.css"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "robinherbots/inputmask",`
`3`	`3`	`"description": "Inputmask is a javascript library which creates an input mask. Inputmask can run against vanilla javascript, jQuery and jqlite.",`
`4`		`- "version": "5.0.6-beta.51",`
	`4`	`+ "version": "5.0.6-beta.52",`
`5`	`5`	`"type": "library",`
`6`	`6`	`"keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],`
`7`	`7`	`"homepage": "http://robinherbots.github.io/Inputmask",`
Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,8 @@ var EventHandlers = {`
`100`	`100`	`k = e.which \|\| e.charCode \|\| e.keyCode;`
`101`	`101`
`102`	`102`	`if (checkval !== true && (!(e.ctrlKey && e.altKey) && (e.ctrlKey \|\| e.metaKey \|\| inputmask.ignorable))) {`
`103`		`- if (k === keyCode.ENTER && inputmask.undoValue !== getBuffer.call(inputmask).join("")) {`
`104`		`- inputmask.undoValue = getBuffer.call(inputmask).join("");`
	`103`	`+ if (k === keyCode.ENTER && inputmask.undoValue !== inputmask._valueGet(true)) {`
	`104`	`+ inputmask.undoValue = inputmask._valueGet(true);`
`105`	`105`	`// e.preventDefault();`
`106`	`106`	`setTimeout(function () {`
`107`	`107`	`$input.trigger("change");`
`@@ -192,7 +192,6 @@ var EventHandlers = {`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`	`checkVal(input, true, false, pasteValue.toString().split(""), e);`
`195`		`- // writeBuffer(input, getBuffer(), seekNext(getLastValidPosition()), e, inputmask.undoValue !== getBuffer().join(""));`
`196`	`195`
`197`	`196`	`return e.preventDefault();`
`198`	`197`	`},`
`@@ -373,7 +372,7 @@ var EventHandlers = {`
`373`	`372`	`if (opts.positionCaretOnTab === true && inputmask.mouseEnter === false && (!isComplete.call(inputmask, getBuffer.call(inputmask)) \|\| getLastValidPosition.call(inputmask) === -1)) {`
`374`	`373`	`EventHandlers.clickEvent.apply(input, [e, true]);`
`375`	`374`	`}`
`376`		`- inputmask.undoValue = getBuffer.call(inputmask).join("");`
	`375`	`+ inputmask.undoValue = inputmask._valueGet(true);`
`377`	`376`	`},`
`378`	`377`	`invalidEvent: function (e) {`
`379`	`378`	`this.inputmask.validationEvent = true;`
`@@ -411,7 +410,7 @@ var EventHandlers = {`
`411`	`410`	`if (document.execCommand) document.execCommand("copy"); // copy selected content to system clipbaord`
`412`	`411`
`413`	`412`	`handleRemove.call(inputmask, input, keyCode.DELETE, pos);`
`414`		`- writeBuffer(input, getBuffer.call(inputmask), maskset.p, e, inputmask.undoValue !== getBuffer.call(inputmask).join(""));`
	`413`	`+ writeBuffer(input, getBuffer.call(inputmask), maskset.p, e, inputmask.undoValue !== inputmask._valueGet(true));`
`415`	`414`	`}`
`416`	`415`	`,`
`417`	`416`	`blurEvent: function (e) {`
`@@ -450,8 +449,8 @@ var EventHandlers = {`
`450`	`449`	`writeBuffer(input, buffer, undefined, e);`
`451`	`450`	`}`
`452`	`451`
`453`		`- if (inputmask.undoValue !== getBuffer.call(inputmask).join("")) {`
`454`		`- inputmask.undoValue = getBuffer.call(inputmask).join("");`
	`452`	`+ if (inputmask.undoValue !== inputmask._valueGet(true)) {`
	`453`	`+ inputmask.undoValue = inputmask._valueGet(true);`
`455`	`454`	`$input.trigger("change");`
`456`	`455`	`}`
`457`	`456`	`}`
`@@ -476,7 +475,7 @@ var EventHandlers = {`
`476`	`475`	`submitEvent: function () { //trigger change on submit if any`
`477`	`476`	`const inputmask = this.inputmask, opts = inputmask.opts;`
`478`	`477`
`479`		`- if (inputmask.undoValue !== getBuffer.call(inputmask).join("")) {`
	`478`	`+ if (inputmask.undoValue !== inputmask._valueGet(true)) {`
`480`	`479`	`inputmask.$el.trigger("change");`
`481`	`480`	`}`
`482`	`481`	`if (opts.clearMaskOnLostFocus && getLastValidPosition.call(inputmask) === -1 && inputmask._valueGet && inputmask._valueGet() === getBufferTemplate.call(inputmask).join("")) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ function applyInputValue(input, value) {`
`23`	`23`	`if (typeof opts.onBeforeMask === "function") value = opts.onBeforeMask.call(inputmask, value, opts) \|\| value;`
`24`	`24`	`value = value.toString().split("");`
`25`	`25`	`checkVal(input, true, false, value);`
`26`		`- inputmask.undoValue = getBuffer.call(inputmask).join("");`
	`26`	`+ inputmask.undoValue = inputmask._valueGet(true);`
`27`	`27`	`if ((opts.clearMaskOnLostFocus \|\| opts.clearIncomplete) && input.inputmask._valueGet() === getBufferTemplate.call(inputmask).join("") && getLastValidPosition.call(inputmask) === -1) {`
`28`	`28`	`input.inputmask._valueSet("");`
`29`	`29`	`}`
`@@ -146,7 +146,7 @@ function checkVal(input, writeOut, strict, nptvl, initiatingEvent) {`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`if (writeOut) {`
`149`		`- writeBuffer.call(inputmask, input, getBuffer.call(inputmask), result ? result.forwardPosition : inputmask.caretPos.begin, initiatingEvent \|\| new $.Event("checkval"), initiatingEvent && initiatingEvent.type === "input" && inputmask.undoValue !== getBuffer.call(inputmask).join(""));`
	`149`	`+ writeBuffer.call(inputmask, input, getBuffer.call(inputmask), result ? result.forwardPosition : inputmask.caretPos.begin, initiatingEvent \|\| new $.Event("checkval"), initiatingEvent && initiatingEvent.type === "input" && inputmask.undoValue !== inputmask._valueGet(true));`
`150`	`150`	`// for (var vndx in maskset.validPositions) {`
`151`	`151`	`// if (maskset.validPositions[vndx].match.generated !== true) { //only remove non forced generated`
`152`	`152`	`// delete maskset.validPositions[vndx].generatedInput; //clear generated markings ~ consider initializing with a value as fully typed`