Implement Reverso Context #19

Prevent to speak selected text by holding Alt or Cmd while selecting text with in Safari
filimo · Oct 10, 2019 · 5f1f8fb · 5f1f8fb
1 parent 9369957
commit 5f1f8fb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 21 deletions.
diff --git a/ReaderTranslator/Views/ReaderView/Modes/SafariView.swift b/ReaderTranslator/Views/ReaderView/Modes/SafariView.swift
@@ -31,26 +31,25 @@ struct SafariView: View {
                 if let extra = event.extra,
                     extra.shiftKey == false {
 
-                    if extra.metaKey == true {
-                        SpeechSynthesizer.speak()
-                    }else{
-                        if extra.keyCode == 65 { // a
-                            self.store.isVoiceEnabled.toggle()
-                        }
-                        if extra.keyCode == 83 { // s
-                            self.store.canSafariSendSelectedText.toggle()
-                            if self.store.canSafariSendSelectedText {
-                                self.store.translateAction = .translator(event.extra?.selectedText ?? "")
-                            }
-                        }
-                        if extra.altKey == true && extra.metaKey == true { //Alt+Cmd
-                            SpeechSynthesizer.speak()
+                    if extra.keyCode == 65 { // a
+                        self.store.isVoiceEnabled.toggle()
+                    }
+                    if extra.keyCode == 83 { // s
+                        self.store.canSafariSendSelectedText.toggle()
+                        if self.store.canSafariSendSelectedText {
+                            self.store.translateAction = .translator(event.extra?.selectedText ?? "")
                         }
                     }
+                    if extra.altKey == true && extra.metaKey == true { //Alt+Cmd
+                        SpeechSynthesizer.speak()
+                    }
                 }
             case "selectionchange":
                 if store.canSafariSendSelectedText {
-                    store.translateAction = .translator(event.extra?.selectedText ?? "")
+                    if let extra = event.extra,
+                        extra.altKey != true && extra.metaKey != true {
+                        store.translateAction = .translator(event.extra?.selectedText ?? "")
+                    }
                 }
             default:
                 os_log("DOMEvent %@ is not recognized", type: .debug, event.name)

diff --git a/ReaderTranslatorSafari/reader-translate-extension.js b/ReaderTranslatorSafari/reader-translate-extension.js
@@ -1,4 +1,6 @@
 (function() {
+    var keysStatus = {}
+
     function send(name, source, e) {
         var txt = document.getSelection().toString()
         if(txt.trim()) {
@@ -7,12 +9,12 @@
                 name: name,
                 source: source,
                 extra: {
-                    ctrlKey: e.ctrlKey,
-                    altKey: e.altKey,
-                    metaKey: e.metaKey, //⌘ Command
-                    shiftKey: e.shiftKey,
-                    which: e.which,
-                    keyCode: e.keyCode,
+                    ctrlKey: e.ctrlKey || keysStatus.ctrlKey,
+                    altKey: e.altKey || keysStatus.altKey,
+                    metaKey: e.metaKey || keysStatus.metaKey, //⌘ Command
+                    shiftKey: e.shiftKey || keysStatus.shiftKey,
+                    which: e.which || keysStatus.which,
+                    keyCode: e.keyCode || keysStatus.keyCode,
                     selectedText: txt,
                 }
             }
@@ -25,6 +27,14 @@
 //        send({name: 'DOMContentLoaded', source: 'document'})
     })
 
+    document.addEventListener("mousedown", (event) => {
+        keysStatus = event
+    })
+
+    document.addEventListener("mouseup", (event) => {
+        keysStatus = {}
+    })
+
     document.addEventListener('selectionchange', (event) => {
         var txt = document.getSelection().toString()
         if(txt.trim()) {