From f39a8b237df52a25b1cb32bef9e4fb1dd3c0caa7 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 23 Dec 2016 17:01:37 +0100
Subject: [PATCH] Improved UX for inline code escaping

---
 .../redactor2/plugins/WoltLabKeydown.js       | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js
index 7df1da8fd3..fd514ffce8 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabKeydown.js
@@ -5,6 +5,62 @@ $.Redactor.prototype.WoltLabKeydown = function() {
 	
 	return {
 		init: function () {
+			var mpInit = this.keydown.init;
+			this.keydown.init = (function (e) {
+				var returnValue = mpInit.call(this, e);
+				
+				if (returnValue !== false && !e.originalEvent.defaultPrevented) {
+					e = e.originalEvent;
+					
+					// 39 == right
+					if (e.which === 39 && !e.ctrlKey && !e.shiftKey && !e.metaKey && !e.altKey) {
+						var selection = window.getSelection();
+						if (!selection.isCollapsed) {
+							return;
+						}
+						
+						var current = selection.anchorNode;
+						if (current.nodeType !== Node.TEXT_NODE || selection.getRangeAt(0).startOffset !== current.textContent.length) {
+							return;
+						}
+						
+						var parent = current.parentNode;
+						if (parent.nodeName !== 'KBD') {
+							return;
+						}
+						
+						// check if caret is at the very end
+						
+						// check if there is absolutely nothing afterwards
+						var isAtTheVeryEnd = true;
+						var node = parent;
+						while (node && node !== this.core.editor()[0]) {
+							if (node.nextSibling !== null) {
+								// strip empty text nodes
+								while (node.nextSibling && node.nextSibling.nodeType === Node.TEXT_NODE && node.nextSibling.textContent.length === 0) {
+									node.parentNode.removeChild(node.nextSibling);
+								}
+								
+								if (node.nextSibling && node.nextSibling.nodeName !== 'BR' || node.nextSibling.nextSibling !== null) {
+									isAtTheVeryEnd = false;
+									break;
+								}
+							}
+							
+							node = node.parentNode;
+						}
+						
+						if (isAtTheVeryEnd) {
+							parent.parentNode.insertBefore(document.createTextNode('\u200B'), parent.nextSibling);
+						}
+					}
+				}
+			}).bind(this);
+			
+			// rebind keydown event
+			this.core.editor().off('keydown.redactor');
+			this.core.editor().on('keydown.redactor', this.keydown.init.bind(this));
+			
 			this.keydown.onArrowDown = (function() {
 				var tags = this.WoltLabKeydown._getBlocks();
 				
-- 
2.20.1