fixed enter undo issues

pjdjr · Nov 22, 2016 · 9edc910 · 9edc910
1 parent 4cc633c
commit 9edc910
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/js/tinymce/classes/EnterKey.js b/js/tinymce/classes/EnterKey.js
@@ -670,6 +670,7 @@ define("tinymce/EnterKey", [
 			// Allow custom handling of new blocks
 			editor.fire('NewBlock', {newBlock: newBlock});
 
+			undoManager.typing = false;
 			undoManager.add();
 		}
 

diff --git a/js/tinymce/classes/Shortcuts.js b/js/tinymce/classes/Shortcuts.js
@@ -108,7 +108,7 @@ define("tinymce/Shortcuts", [
 		}
 
 		function isFunctionKey(e) {
-			return e.keyCode >= 112 && e.keyCode <= 123;
+			return e.type === "keydown" && e.keyCode >= 112 && e.keyCode <= 123;
 		}
 
 		function matchShortcut(e, shortcut) {

diff --git a/js/tinymce/classes/UndoManager.js b/js/tinymce/classes/UndoManager.js
@@ -78,7 +78,7 @@ define("tinymce/UndoManager", [
 				return;
 			}
 
-			if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode === 45 || keyCode === 13 || e.ctrlKey) {
+			if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode === 45 || e.ctrlKey) {
 				addNonTypingUndoLevel();
 				editor.nodeChanged();
 			}

diff --git a/tests/tinymce/UndoManager.js b/tests/tinymce/UndoManager.js
@@ -96,7 +96,7 @@ test('Typing state', function() {
 	editor.dom.fire(editor.getBody(), 'keydown', {keyCode: 65});
 	ok(editor.undoManager.typing);
 
-	editor.dom.fire(editor.getBody(), 'keyup', {keyCode: 13});
+	editor.dom.fire(editor.getBody(), 'keydown', {keyCode: 13});
 	ok(!editor.undoManager.typing);
 
 	selectAllFlags = {keyCode: 65, ctrlKey: false, altKey: false, shiftKey: false};