match native Windows Home/End key behaviour

kevinansfield · Sep 25, 2017 · f2e9818 · f2e9818
1 parent b3e9f8b
commit f2e9818
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 15 deletions.
diff --git a/debug/simplemde.debug.js b/debug/simplemde.debug.js
diff --git a/debug/simplemde.js b/debug/simplemde.js
@@ -14651,8 +14651,14 @@ var CodeMirrorSpellChecker = require("codemirror-spell-checker");
 var marked;
 
 
-// Some variables
-var isMac = /Mac/.test(navigator.platform);
+// Platform/Browser detection
+// borrowed from https://github.com/codemirror/CodeMirror/blob/master/src/util/browser.js
+var userAgent = navigator.userAgent;
+var platform = navigator.platform;
+var edge = /Edge\/(\d+)/.exec(userAgent);
+var ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
+var mac = ios || /Mac/.test(platform);
+var windows = /win/i.test(platform);
 
 // Mapping of actions that can be bound to keyboard shortcuts or toolbar buttons
 var bindings = {
@@ -14719,7 +14725,7 @@ var isMobile = function() {
  * Fix shortcut. Mac use Command, others use Ctrl.
  */
 function fixShortcut(name) {
-	if(isMac) {
+	if(mac) {
 		name = name.replace("Ctrl", "Cmd");
 	} else {
 		name = name.replace("Cmd", "Ctrl");
@@ -14739,7 +14745,7 @@ function createIcon(options, enableTooltips, shortcuts) {
 	if(options.title && enableTooltips) {
 		el.title = createTootlip(options.title, options.action, shortcuts);
 
-		if(isMac) {
+		if(mac) {
 			el.title = el.title.replace("Ctrl", "⌘");
 			el.title = el.title.replace("Alt", "⌥");
 		}
@@ -16092,6 +16098,12 @@ SimpleMDE.prototype.render = function(el) {
 		if(cm.getOption("fullScreen")) toggleFullScreen(self);
 	};
 
+	// match Windows Home/End behaviour
+	if(windows) {
+		keyMaps["Home"] = "goLineLeftSmart";
+		keyMaps["End"] = "goLineRight";
+	}
+
 	document.addEventListener("keydown", function(e) {
 		e = e || window.event;
 

diff --git a/dist/simplemde.min.js b/dist/simplemde.min.js
diff --git a/src/js/simplemde.js b/src/js/simplemde.js
@@ -17,8 +17,14 @@ var CodeMirrorSpellChecker = require("codemirror-spell-checker");
 var marked;
 
 
-// Some variables
-var isMac = /Mac/.test(navigator.platform);
+// Platform/Browser detection
+// borrowed from https://github.com/codemirror/CodeMirror/blob/master/src/util/browser.js
+var userAgent = navigator.userAgent;
+var platform = navigator.platform;
+var edge = /Edge\/(\d+)/.exec(userAgent);
+var ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
+var mac = ios || /Mac/.test(platform);
+var windows = /win/i.test(platform);
 
 // Mapping of actions that can be bound to keyboard shortcuts or toolbar buttons
 var bindings = {
@@ -85,7 +91,7 @@ var isMobile = function() {
  * Fix shortcut. Mac use Command, others use Ctrl.
  */
 function fixShortcut(name) {
-	if(isMac) {
+	if(mac) {
 		name = name.replace("Ctrl", "Cmd");
 	} else {
 		name = name.replace("Cmd", "Ctrl");
@@ -105,7 +111,7 @@ function createIcon(options, enableTooltips, shortcuts) {
 	if(options.title && enableTooltips) {
 		el.title = createTootlip(options.title, options.action, shortcuts);
 
-		if(isMac) {
+		if(mac) {
 			el.title = el.title.replace("Ctrl", "⌘");
 			el.title = el.title.replace("Alt", "⌥");
 		}
@@ -1458,6 +1464,12 @@ SimpleMDE.prototype.render = function(el) {
 		if(cm.getOption("fullScreen")) toggleFullScreen(self);
 	};
 
+	// match Windows Home/End behaviour
+	if(windows) {
+		keyMaps["Home"] = "goLineLeftSmart";
+		keyMaps["End"] = "goLineRight";
+	}
+
 	document.addEventListener("keydown", function(e) {
 		e = e || window.event;