fix detecting undo/redo

antonmedv · Apr 4, 2020 · a0f316e · a0f316e
1 parent 8d0a522
commit a0f316e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/codejar.ts b/codejar.ts
@@ -263,7 +263,7 @@ export class CodeJar {
     }
   }
 
-  handleUndoRedo(event: KeyboardEvent) {
+  private handleUndoRedo(event: KeyboardEvent) {
     if (isUndo(event)) {
       event.preventDefault()
       this.at--
@@ -286,7 +286,7 @@ export class CodeJar {
     }
   }
 
-  recordHistory() {
+  private recordHistory() {
     if (!this.focus) return
 
     const html = this.editor.innerHTML
@@ -343,12 +343,16 @@ export class CodeJar {
   }
 }
 
+function isCtrl(event: KeyboardEvent) {
+  return event.metaKey || event.ctrlKey
+}
+
 function isUndo(event: KeyboardEvent) {
-  return event.metaKey && !event.shiftKey && event.code === "KeyZ"
+  return isCtrl(event) && !event.shiftKey && event.code === "KeyZ"
 }
 
 function isRedo(event: KeyboardEvent) {
-  return event.metaKey && event.shiftKey && event.code === "KeyZ"
+  return isCtrl(event) && event.shiftKey && event.code === "KeyZ"
 }
 
 type HistoryRecord = {