From b3d33cc85264f90419621eb3eec7ba955186481a Mon Sep 17 00:00:00 2001
From: Gnome Ann <>
Date: Tue, 12 Oct 2021 00:09:02 -0400
Subject: [PATCH] Fix enter key behaviour in the editor when not using Firefox

---
 static/application.js | 42 +++++++++++++++++++++++++++++++++++++++++-
 templates/index.html  |  2 +-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/static/application.js b/static/application.js
index a2961c4c..44fa349f 100644
--- a/static/application.js
+++ b/static/application.js
@@ -737,6 +737,44 @@ function autofocus(event) {
 	}
 }
 
+function chunkOnTextInput(event) {
+	// The enter key does not behave correctly in almost all non-Firefox
+	// browsers, so we (attempt to) shim all enter keystrokes here to behave the
+	// same as in Firefox
+	if(event.originalEvent.data.slice(-1) === '\n') {
+		event.preventDefault();
+		var s = getSelection();  // WARNING: Do not use rangy.getSelection() instead of getSelection()
+		var r = s.getRangeAt(0);
+
+		// We prefer using document.execCommand here because it works best on
+		// mobile devices, but the other method is also here as
+		// a fallback
+		if(document.queryCommandSupported && document.execCommand && document.queryCommandSupported('insertHTML')) {
+			document.execCommand('insertHTML', false, event.originalEvent.data.slice(0, -1) + '<br/><span id="_EDITOR_SENTINEL_">|</span>');
+			var t = $('#_EDITOR_SENTINEL_').contents().filter(function() { return this.nodeType === 3; })[0];
+		} else {
+			var t = document.createTextNode('|');
+			r.insertNode(document.createElement('br'));
+			r.collapse(false);
+			r.insertNode(t);
+		}
+
+		r.selectNodeContents(t);
+		s.removeAllRanges();
+		s.addRange(r);
+		if(document.queryCommandSupported && document.execCommand && document.queryCommandSupported('forwardDelete')) {
+			r.collapse(true);
+			document.execCommand('forwardDelete');
+		} else {
+			// deleteContents() sometimes breaks using the left
+			// arrow key in some browsers so we prefer the
+			// document.execCommand method
+			r.deleteContents();
+		}
+		return;
+	}
+}
+
 function chunkOnKeyDown(event) {
 	// Make escape commit the changes (Originally we had Enter here to but its not required and nicer for users if we let them type freely
 	// You can add the following after 27 if you want it back to committing on enter : || (!event.shiftKey && event.keyCode == 13)
@@ -1427,7 +1465,9 @@ $(document).ready(function(){
 	});
 
 	// Register editing events
-	game_text.on('keydown',
+	game_text.on('textInput',
+		chunkOnTextInput
+	).on('keydown',
 		chunkOnKeyDown
 	).on('paste', 
 		chunkOnPaste
diff --git a/templates/index.html b/templates/index.html
index 3e402eaf..5eb15ed3 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<script src="static/jquery-3.6.0.min.js"></script>
 	<script src="static/socket.io.min.js"></script>
-	<script src="static/application.js?ver=1.16.2e"></script>
+	<script src="static/application.js?ver=1.16.2f"></script>
 	<script src="static/bootstrap.min.js"></script>
 	<script src="static/bootstrap-toggle.min.js"></script>
 	<script src="static/rangy-core.min.js"></script>