From 823a24475cbfa7b4885cd27b7375197058f544c5 Mon Sep 17 00:00:00 2001
From: Timothy Lim <tim.lim@intercom.io>
Date: Fri, 11 Oct 2019 17:29:55 +0800
Subject: [PATCH] Add ability to disable website keybindings for show/hide
 controller

---
 inject.js    | 7 +++++++
 options.html | 4 ++++
 options.js   | 4 ++++
 3 files changed, 15 insertions(+)

diff --git a/inject.js b/inject.js
index ad831b4..8d213f7 100644
--- a/inject.js
+++ b/inject.js
@@ -6,6 +6,7 @@
       speeds: {},           // empty object to hold speed for each source
 
       displayKeyCode: 86,   // default: V
+      displayForce: false,
       rememberSpeed: false, // default: false
       audioBoolean: false,  // default: false
       startHidden: false,   // default: false
@@ -74,6 +75,7 @@
         keyBindings: tc.settings.keyBindings,
         version: tc.settings.version,
         displayKeyCode: tc.settings.displayKeyCode,
+        displayForce: tc.settings.displayForce,
         rememberSpeed: tc.settings.rememberSpeed,
         audioBoolean: tc.settings.audioBoolean,
         startHidden: tc.settings.startHidden,
@@ -83,6 +85,7 @@
     }
     tc.settings.lastSpeed = Number(storage.lastSpeed);
     tc.settings.displayKeyCode = Number(storage.displayKeyCode);
+    tc.settings.displayForce = String(storage.displayForce);
     tc.settings.rememberSpeed = Boolean(storage.rememberSpeed);
     tc.settings.audioBoolean = Boolean(storage.audioBoolean);
     tc.settings.startHidden = Boolean(storage.startHidden);
@@ -360,6 +363,10 @@
 
           if (keyCode == tc.settings.displayKeyCode) {
             runAction('display', document, true)
+            if (tc.settings.displayForce === "true") {// disable websites key bindings
+              event.preventDefault();
+              event.stopPropagation();
+            }
           }
         var item = tc.settings.keyBindings.find(item => item.key === keyCode);
         if (item) {
diff --git a/options.html b/options.html
index 102906f..1682d55 100644
--- a/options.html
+++ b/options.html
@@ -15,6 +15,10 @@
       <div class="row">
         <label for="displayKeyInput">Show/hide controller</label>
         <input id="displayKeyInput" placeholder="press a key" type="text" value=""/>
+        <select class="customForce" id="displayForce">
+            <option value="false">Do not disable website key bindings</option>
+            <option value="true">Disable websites key bindings</option>
+        </select>
       </div>
         <div class="row customs" id="slower">
             <select class="customDo">
diff --git a/options.js b/options.js
index ebf3f40..fc06055 100644
--- a/options.js
+++ b/options.js
@@ -3,6 +3,7 @@ var regStrip=/^[\r\t\f\v ]+|[\r\t\f\v ]+$/gm;
 var tcDefaults = {
   speed: 1.0,           // default:
   displayKeyCode: 86,   // default: V
+  displayForce: false,
   rememberSpeed: false, // default: false
   audioBoolean: false, // default: false
   startHidden: false,   // default: false
@@ -150,6 +151,7 @@ function save_options() {
   Array.from(document.querySelectorAll(".customs")).forEach(item => createKeyBindings(item)); // Remove added shortcuts
 
   var displayKeyCode = document.getElementById('displayKeyInput').keyCode;
+  var displayForce = document.getElementById('displayForce').value;
   var rememberSpeed = document.getElementById('rememberSpeed').checked;
   var audioBoolean = document.getElementById('audioBoolean').checked;
   var startHidden = document.getElementById('startHidden').checked;
@@ -161,6 +163,7 @@ function save_options() {
   chrome.storage.sync.remove(["resetSpeed", "speedStep", "fastSpeed", "rewindTime", "advanceTime", "resetKeyCode", "slowerKeyCode", "fasterKeyCode", "rewindKeyCode", "advanceKeyCode", "fastKeyCode"]);
   chrome.storage.sync.set({
     displayKeyCode: displayKeyCode,
+    displayForce: displayForce,
     rememberSpeed:  rememberSpeed,
     audioBoolean:  audioBoolean,
     startHidden:    startHidden,
@@ -181,6 +184,7 @@ function save_options() {
 function restore_options() {
   chrome.storage.sync.get(tcDefaults, function(storage) {
     updateShortcutInputText('displayKeyInput', storage.displayKeyCode);
+    document.getElementById('displayForce').value = storage.displayForce;
     document.getElementById('rememberSpeed').checked = storage.rememberSpeed;
     document.getElementById('audioBoolean').checked = storage.audioBoolean;
     document.getElementById('startHidden').checked = storage.startHidden;