Merge upstream

.gitignore

@@ -3,3 +3,4 @@ local
 
 # IntelliJ IDEA
 .idea/
+node_modules

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.5.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+
+  - repo: https://github.com/prettier/prettier
+    rev: 1.19.1 # Use the sha or tag you want to point at
+    hooks:
+      - id: prettier

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "printWidth": 80,
+  "semi": true,
+  "endOfLine": "auto",
+  "proseWrap": "always"
+}

README.md

@@ -2,38 +2,73 @@
 
 **TL;DR: faster playback translates to better engagement and retention.**
 
-Average adult reads prose text at [250 to 300 words per minute](http://www.paperbecause.com/PIOP/files/f7/f7bb6bc5-2c4a-466f-9ae7-b483a2c0dca4.pdf) (wpm). By contrast, the average rate of speech for English speakers is ~150 wpm, with slide presentations often closer to 100 wpm. As a result, when given the choice, many viewers [speed up video playback to ~1.3\~1.5 its recorded rate](http://research.microsoft.com/en-us/um/redmond/groups/coet/compression/chi99/paper.pdf) to compensate for the difference.
+Average adult reads prose text at
-
+[250 to 300 words per minute](http://www.paperbecause.com/PIOP/files/f7/f7bb6bc5-2c4a-466f-9ae7-b483a2c0dca4.pdf)
-Many viewers report that [accelerated viewing keeps their attention longer](http://www.enounce.com/docs/BYUPaper020319.pdf): faster delivery keeps the viewer more engaged with the content. In fact, with a little training many end up watching videos at 2x+ the recorded speed. Some studies report that after being exposed to accelerated playback, [listeners become uncomfortable](http://alumni.media.mit.edu/~barons/html/avios92.html#beasleyalteredspeech) if they are forced to return to normal rate of presentation.
+(wpm). By contrast, the average rate of speech for English speakers is ~150 wpm,
+with slide presentations often closer to 100 wpm. As a result, when given the
+choice, many viewers
+[speed up video playback to ~1.3\~1.5 its recorded rate](http://research.microsoft.com/en-us/um/redmond/groups/coet/compression/chi99/paper.pdf)
+to compensate for the difference.
 
+Many viewers report that
+[accelerated viewing keeps their attention longer](http://www.enounce.com/docs/BYUPaper020319.pdf):
+faster delivery keeps the viewer more engaged with the content. In fact, with a
+little training many end up watching videos at 2x+ the recorded speed. Some
+studies report that after being exposed to accelerated playback,
+[listeners become uncomfortable](http://alumni.media.mit.edu/~barons/html/avios92.html#beasleyalteredspeech)
+if they are forced to return to normal rate of presentation.
 
 ## Faster HTML5 Video
 
-HTML5 video provides a native API to accelerate playback of any video. The problem is, many players either hide, or limit this functionality. For best results playback speed adjustments should be easy and frequent to match the pace and content being covered: we don't read at a fixed speed, and similarly, we need an easy way to accelerate the video, slow it down, and quickly rewind the last point to listen to it a few more times.
+HTML5 video provides a native API to accelerate playback of any video. The
+problem is, many players either hide, or limit this functionality. For best
+results playback speed adjustments should be easy and frequent to match the pace
+and content being covered: we don't read at a fixed speed, and similarly, we
+need an easy way to accelerate the video, slow it down, and quickly rewind the
+last point to listen to it a few more times.
 
 ![Player](https://cloud.githubusercontent.com/assets/2400185/24076745/5723e6ae-0c41-11e7-820c-1d8e814a2888.png)
 
 #### *Install [Chrome](https://chrome.google.com/webstore/detail/video-speed-controller/nffaoalbilbmmfgbnbgppjihopabppdk) or [Firefox](https://addons.mozilla.org/en-us/firefox/addon/videospeed/) Extension*
 
-Once the extension is installed simply navigate to any page that offers HTML5 video ([example](http://www.youtube.com/watch?v=E9FxNzv1Tr8)), and you'll see a speed indicator in top left corner. Hover over the indicator to reveal the controls to accelerate, slowdown, and quickly rewind or advance the video. Or, even better, simply use your keyboard:
+\*\* Once the extension is installed simply navigate to any page that offers
+HTML5 video ([example](http://www.youtube.com/watch?v=E9FxNzv1Tr8)), and you'll
+see a speed indicator in top left corner. Hover over the indicator to reveal the
+controls to accelerate, slowdown, and quickly rewind or advance the video. Or,
+even better, simply use your keyboard:
 
-* **S** - decrease playback speed.
+- **S** - decrease playback speed.
-* **D** - increase playback speed.
+- **D** - increase playback speed.
-* **R** - reset playback speed to 1.0x.
+- **R** - reset playback speed to 1.0x.
-* **Z** - rewind video by 10 seconds.
+- **Z** - rewind video by 10 seconds.
-* **X** - advance video by 10 seconds.
+- **X** - advance video by 10 seconds.
-* **G** - toggle between current and user configurable preferred speed.
+- **G** - toggle between current and user configurable preferred speed.
-* **V** - show/hide the controller.
+- **V** - show/hide the controller.
 
-You can customize and reassign the default shortcut keys in the extensions settings page, as well as add additional shortcut keys to match your preferences. For example, you can assign multiple different "preferred speed" shortcuts with different values, which will allow you to quickly toggle between your most commonly used speeds. To add a new shortcut, open extension settings and click "Add New".
+You can customize and reassign the default shortcut keys in the extensions
+settings page, as well as add additional shortcut keys to match your
+preferences. For example, you can assign multiple different "preferred speed"
+shortcuts with different values, which will allow you to quickly toggle between
+your most commonly used speeds. To add a new shortcut, open extension settings
+and click "Add New".
 
 ![settings Add New shortcut](https://user-images.githubusercontent.com/121805/50726471-50242200-1172-11e9-902f-0e5958387617.jpg)
 
-Some sites may assign other functionality to one of the assigned shortcut keys — these collisions are inevitable, unfortunately. As a workaround, the extension listens both for lower and upper case values (i.e. you can use `Shift-<shortcut>`) if there is other functionality assigned to the lowercase key. This is not a perfect solution, as some sites may listen to both, but works most of the time.
+Some sites may assign other functionality to one of the assigned shortcut keys —
+these collisions are inevitable, unfortunately. As a workaround, the extension
+listens both for lower and upper case values (i.e. you can use
+`Shift-<shortcut>`) if there is other functionality assigned to the lowercase
+key. This is not a perfect solution, as some sites may listen to both, but works
+most of the time.
 
 ### FAQ
 
-**The video controls are not showing up?** This extension is only compatible with HTML5 video. If you don't see the controls showing up, chances are you are viewing a Flash video. If you want to confirm, try right-clicking on the video and inspect the menu: if it mentions flash, then that's the issue. That said, most sites will fallback to HTML5 if they detect that Flash is not available. You can try manually disabling Flash from the browser.
+**The video controls are not showing up?** This extension is only compatible
+with HTML5 video. If you don't see the controls showing up, chances are you are
+viewing a Flash video. If you want to confirm, try right-clicking on the video
+and inspect the menu: if it mentions flash, then that's the issue. That said,
+most sites will fallback to HTML5 if they detect that Flash is not available.
+You can try manually disabling Flash from the browser.
 
 ### License
 

inject.css

@@ -1,8 +1,12 @@
-.vsc-nosource { display: none !important; }
+.vsc-nosource {
-.vsc-hidden { display: none !important; }
+  display: none !important;
+}
+.vsc-hidden {
+  display: none !important;
+}
 .vsc-manual {
   visibility: visible !important;
-  opacity: 1.0 !important;
+  opacity: 1 !important;
 }
 
 /* Origin specific overrides */
@@ -14,13 +18,13 @@
 
 .ytp-autohide .vsc-controller {
   visibility: hidden;
-  transition: opacity .25s cubic-bezier(0.4,0,0.2,1);
+  transition: opacity 0.25s cubic-bezier(0.4, 0, 0.2, 1);
   opacity: 0;
 }
 
 .ytp-autohide .vcs-show {
   visibility: visible;
-  opacity: 1.0;
+  opacity: 1;
 }
 
 /* YouTube embedded player */
@@ -76,7 +80,8 @@ div.video-wrapper + div.target {
 }
 
 /* Fix black overlay on Kickstarter */
-div.video-player.has_played.vertically_center:before, div.legacy-video-player.has_played.vertically_center:before {
+div.video-player.has_played.vertically_center:before,
+div.legacy-video-player.has_played.vertically_center:before {
   content: none !important;
 }
 

inject.js

@@ -12,20 +12,51 @@
     startHidden: false, // default: false
     controllerOpacity: 0.3, // default: 0.3
     keyBindings: [],
-      blacklist: `
+    blacklist: `\
       www.instagram.com
       twitter.com
       vine.co
       imgur.com
       teams.microsoft.com
-      `.replace(regStrip,'')
+    `.replace(regStrip, ""),
+    defaultLogLevel: 4,
+    logLevel: 3
   }
 };
 
+/* Log levels (depends on caller specifying the correct level)
+  1 - none
+  2 - error
+  3 - warning
+  4 - info
+  5 - debug
+  6 - debug high verbosity + stack trace on each message
+*/
+function log(message, level) {
+  verbosity = tc.settings.logLevel;
+  if (typeof level === "undefined") {
+    level = tc.settings.defaultLogLevel;
+  }
+  if (verbosity >= level) {
+    if (level === 2) {
+      console.log("ERROR:" + message);
+    } else if (level === 3) {
+      console.log("WARNING:" + message);
+    } else if (level === 4) {
+      console.log("INFO:" + message);
+    } else if (level === 5) {
+      console.log("DEBUG:" + message);
+    } else if (level === 6) {
+      console.log("DEBUG (VERBOSE):" + message);
+      console.trace();
+    }
+  }
+}
+
 chrome.storage.sync.get(tc.settings, function(storage) {
   tc.settings.keyBindings = storage.keyBindings; // Array
-    if (storage.keyBindings.length == 0) // if first initialization of 0.5.3
+  if (storage.keyBindings.length == 0) {
-    {
+    // if first initialization of 0.5.3
     // UPDATE
     tc.settings.keyBindings.push({
       action: "slower",
@@ -80,7 +111,7 @@
       startHidden: tc.settings.startHidden,
       enabled: tc.settings.enabled,
       controllerOpacity: tc.settings.controllerOpacity,
-        blacklist: tc.settings.blacklist.replace(regStrip, '')
+      blacklist: tc.settings.blacklist.replace(regStrip, "")
     });
   }
   tc.settings.lastSpeed = Number(storage.lastSpeed);
@@ -122,72 +153,82 @@
 
 function defineVideoController() {
   tc.videoController = function(target, parent) {
-      if (target.dataset['vscid']) {
+    if (target.dataset["vscid"]) {
       return target.vsc;
     }
 
     this.video = target;
     this.parent = target.parentElement || parent;
     this.document = target.ownerDocument;
-      this.id = Math.random().toString(36).substr(2, 9);
+    this.id = Math.random()
-
+      .toString(36)
-      // settings.speeds[] ensures that same source used across video tags (e.g. fullscreen on YT) retains speed setting
+      .substr(2, 9);
-      // this.speed is a controller level variable that retains speed setting across source switches (e.g. video quality, playlist change)
+    storedSpeed = tc.settings.speeds[target.currentSrc];
-      this.speed = 1.0;
-
     if (!tc.settings.rememberSpeed) {
-        if (!tc.settings.speeds[target.currentSrc]) {
+      if (!storedSpeed) {
-          tc.settings.speeds[target.currentSrc] = this.speed;
+        log(
+          "Overwriting stored speed to 1.0 due to rememberSpeed being disabled",
+          5
+        );
+        storedSpeed = 1.0;
       }
       setKeyBindings("reset", getKeyBindings("fast")); // resetSpeed = fastSpeed
     } else {
-        tc.settings.speeds[target.currentSrc] = tc.settings.lastSpeed;
+      log("Recalling stored speed due to rememberSpeed being enabled", 5);
+      storedSpeed = tc.settings.lastSpeed;
     }
 
-      target.playbackRate = tc.settings.speeds[target.currentSrc];
+    log("Explicitly setting playbackRate to: " + storedSpeed, 5);
+    target.playbackRate = storedSpeed;
 
     this.div = this.initializeControls();
 
-      target.addEventListener('play', this.handlePlay = function(event) {
+    target.addEventListener(
+      "play",
+      (this.handlePlay = function(event) {
+        storedSpeed = tc.settings.speeds[event.target.currentSrc];
         if (!tc.settings.rememberSpeed) {
-          if (!tc.settings.speeds[target.currentSrc]) {
+          if (!storedSpeed) {
-            tc.settings.speeds[target.currentSrc] = this.speed;
+            log(
+              "Overwriting stored speed to 1.0 (rememberSpeed not enabled)",
+              4
+            );
+            storedSpeed = 1.0;
           }
+          // resetSpeed isn't really a reset, it's a toggle
+          log("Setting reset keybinding to fast", 5);
           setKeyBindings("reset", getKeyBindings("fast")); // resetSpeed = fastSpeed
         } else {
-          tc.settings.speeds[target.currentSrc] = tc.settings.lastSpeed;
+          log(
+            "Storing lastSpeed into tc.settings.speeds (rememberSpeed enabled)",
+            5
+          );
+          storedSpeed = tc.settings.lastSpeed;
         }
-        target.playbackRate = tc.settings.speeds[target.currentSrc];
+        // TODO: Check if explicitly setting the playback rate to 1.0 is
-      }.bind(this));
+        // necessary when rememberSpeed is disabled (this may accidentally
+        // override a website's intentional initial speed setting interfering
+        // with the site's default behavior)
+        log("Explicitly setting playbackRate to: " + storedSpeed, 4);
+        event.target.playbackRate = storedSpeed;
+      }.bind(this))
+    );
 
-      target.addEventListener('ratechange', this.handleRatechange = function(event) {
+    var observer = new MutationObserver(mutations => {
-        // Ignore ratechange events on unitialized videos.
+      mutations.forEach(mutation => {
-        // 0 == No information is available about the media resource.
+        if (
-        if (event.target.readyState > 0) {
+          mutation.type === "attributes" &&
-          var speed = this.getSpeed();
+          (mutation.attributeName === "src" ||
-          this.speedIndicator.textContent = speed;
+            mutation.attributeName === "currentSrc")
-          tc.settings.speeds[this.video.currentSrc] = speed;
+        ) {
-          tc.settings.lastSpeed = speed;
+          var controller = getController(this.id);
-          this.speed = speed;
-          chrome.storage.sync.set({'lastSpeed': speed}, function() {
-            console.log('Speed setting saved: ' + speed);
-          });
-          // show the controller for 1000ms if it's hidden.
-          runAction('blink', document, null, null);
-        }
-      }.bind(this));
-
-      var observer=new MutationObserver((mutations) => {
-        mutations.forEach((mutation) => {
-          if (mutation.type === 'attributes' && (mutation.attributeName === 'src' || mutation.attributeName === 'currentSrc')){
-            var controller = document.querySelector(`div[data-vscid="${this.id}"]`);
           if (!controller) {
             return;
           }
           if (!mutation.target.src && !mutation.target.currentSrc) {
-              controller.classList.add('vsc-nosource');
+            controller.classList.add("vsc-nosource");
           } else {
-              controller.classList.remove('vsc-nosource');
+            controller.classList.remove("vsc-nosource");
           }
         }
       });
@@ -197,43 +238,43 @@
     });
   };
 
-    tc.videoController.prototype.getSpeed = function() {
-      return parseFloat(this.video.playbackRate).toFixed(2);
-    }
-
   tc.videoController.prototype.remove = function() {
     this.div.remove();
-      this.video.removeEventListener('play',this.handlePlay);
+    this.video.removeEventListener("play", this.handlePlay);
-      this.video.removeEventListener('ratechange',this.handleRatechange);
+    delete this.video.dataset["vscid"];
-      delete this.video.dataset['vscid'];
     delete this.video.vsc;
-    }
+  };
 
   tc.videoController.prototype.initializeControls = function() {
+    log("initializeControls Begin", 5);
     var document = this.document;
-      var speed = parseFloat(tc.settings.speeds[this.video.currentSrc]).toFixed(2),
+    var speed = this.video.playbackRate.toFixed(2),
       top = Math.max(this.video.offsetTop, 0) + "px",
       left = Math.max(this.video.offsetLeft, 0) + "px";
 
-      var wrapper = document.createElement('div');
+    log("Speed variable set to: " + speed, 5);
-      wrapper.classList.add('vsc-controller');
+
-      wrapper.dataset['vscid'] = this.id;
+    var wrapper = document.createElement("div");
+    wrapper.classList.add("vsc-controller");
+    wrapper.dataset["vscid"] = this.id;
 
     if (!this.video.currentSrc) {
-        wrapper.classList.add('vsc-nosource');
+      wrapper.classList.add("vsc-nosource");
     }
 
     if (tc.settings.startHidden) {
-        wrapper.classList.add('vsc-hidden');
+      wrapper.classList.add("vsc-hidden");
     }
 
-      var shadow = wrapper.attachShadow({ mode: 'open' });
+    var shadow = wrapper.attachShadow({ mode: "open" });
     var shadowTemplate = `
         <style>
-          @import "${chrome.runtime.getURL('shadow.css')}";
+          @import "${chrome.runtime.getURL("shadow.css")}";
         </style>
 
-        <div id="controller" style="top:${top}; left:${left}; opacity:${tc.settings.controllerOpacity}">
+        <div id="controller" style="top:${top}; left:${left}; opacity:${
+      tc.settings.controllerOpacity
+    }">
           <span data-action="drag" class="draggable">${speed}</span>
           <span id="controls">
             <button data-action="rewind" class="rw">«</button>
@@ -245,29 +286,40 @@
         </div>
       `;
     shadow.innerHTML = shadowTemplate;
-      shadow.querySelector('.draggable').addEventListener('mousedown', (e) => {
+    shadow.querySelector(".draggable").addEventListener("mousedown", e => {
-        runAction(e.target.dataset['action'], document, false, e);
+      runAction(e.target.dataset["action"], document, false, e);
     });
 
-      forEach.call(shadow.querySelectorAll('button'), function(button) {
+    forEach.call(shadow.querySelectorAll("button"), function(button) {
-        button.onclick = (e) => {
+      button.onclick = e => {
-          runAction(e.target.dataset['action'], document, getKeyBindings(e.target.dataset['action']), e);
+        runAction(
-        }
+          e.target.dataset["action"],
+          document,
+          getKeyBindings(e.target.dataset["action"]),
+          e
+        );
+      };
     });
 
-      this.speedIndicator = shadow.querySelector('span');
+    this.speedIndicator = shadow.querySelector("span");
     var fragment = document.createDocumentFragment();
     fragment.appendChild(wrapper);
 
-      this.video.dataset['vscid'] = this.id;
+    this.video.dataset["vscid"] = this.id;
 
     switch (true) {
-        case (location.hostname == 'www.amazon.com'):
+      case location.hostname == "www.amazon.com":
-        case (location.hostname == 'www.reddit.com'):
+      case location.hostname == "www.reddit.com":
-        case (/hbogo\./).test(location.hostname):
+      case /hbogo\./.test(location.hostname):
         // insert before parent to bypass overlay
         this.parent.parentElement.insertBefore(fragment, this.parent);
         break;
+      case location.hostname == "tv.apple.com":
+        // insert after parent for correct stacking context
+        this.parent
+          .getRootNode()
+          .querySelector(".scrim")
+          .prepend(fragment);
 
       default:
         // Note: when triggered via a MutationRecord, it's possible that the
@@ -276,23 +328,23 @@
         this.parent.insertBefore(fragment, this.parent.firstChild);
     }
     return wrapper;
-    }
+  };
 }
 
-  function initializeWhenReady(document) {
-    escapeStringRegExp.matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
 function escapeStringRegExp(str) {
-      return str.replace(escapeStringRegExp.matchOperatorsRe, '\\$&');
+  matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+  return str.replace(matchOperatorsRe, "\\$&");
 }
 
-    var blacklisted = false;
+function isBlacklisted() {
+  blacklisted = false;
   tc.settings.blacklist.split("\n").forEach(match => {
-      match = match.replace(regStrip,'')
+    match = match.replace(regStrip, "");
     if (match.length == 0) {
       return;
     }
 
-      if (match.startsWith('/')) {
+    if (match.startsWith("/")) {
       try {
         var regexp = new RegExp(match);
       } catch (err) {
@@ -306,13 +358,63 @@
       blacklisted = true;
       return;
     }
-    })
+  });
+  return blacklisted;
+}
 
-    if (blacklisted)
+var coolDown = false;
+function refreshCoolDown() {
+  log("Begin refreshCoolDown", 5);
+  if (coolDown) {
+    clearTimeout(coolDown);
+  }
+  coolDown = setTimeout(function() {
+    coolDown = false;
+  }, 1000);
+  log("End refreshCoolDown", 5);
+}
+
+function setupListener() {
+  document.body.addEventListener(
+    "ratechange",
+    function(event) {
+      if (coolDown) {
+        log("Speed event propagation blocked", 4);
+        event.stopImmediatePropagation();
+      }
+      var controller = event.target.parentElement.querySelector(
+        ".vsc-controller"
+      );
+      var speedIndicator = controller.shadowRoot.querySelector("span");
+      var video = controller.parentElement.querySelector("video");
+      var src = video.currentSrc;
+      var speed = video.playbackRate.toFixed(2);
+
+      log("Playback rate changed to " + speed, 4);
+
+      log("Updating controller with new speed", 5);
+      speedIndicator.textContent = speed;
+      tc.settings.speeds[src] = speed;
+      log("Storing lastSpeed in settings for the rememberSpeed feature", 5);
+      tc.settings.lastSpeed = speed;
+      log("Syncing chrome settings for lastSpeed", 5);
+      chrome.storage.sync.set({ lastSpeed: speed }, function() {
+        log("Speed setting saved: " + speed, 5);
+      });
+      // show the controller for 1000ms if it's hidden.
+      runAction("blink", document, null, null);
+    },
+    true
+  );
+}
+
+function initializeWhenReady(document) {
+  log("Begin initializeWhenReady", 5);
+  if (isBlacklisted()) {
     return;
-
+  }
   window.onload = () => {
-      initializeNow(window.document)
+    initializeNow(window.document);
   };
   if (document) {
     if (document.readyState === "complete") {
@@ -322,9 +424,10 @@
         if (document.readyState === "complete") {
           initializeNow(document);
         }
+      };
     }
   }
-    }
+  log("End initializeWhenReady", 5);
 }
 function inIframe() {
   try {
@@ -333,81 +436,129 @@
     return true;
   }
 }
+function getShadow(parent) {
+  let result = [];
+  function getChild(parent) {
+    if (parent.firstElementChild) {
+      var child = parent.firstElementChild;
+      do {
+        result.push(child);
+        getChild(child);
+        if (child.shadowRoot) {
+          result.push(getShadow(child.shadowRoot));
+        }
+        child = child.nextElementSibling;
+      } while (child);
+    }
+  }
+  getChild(parent);
+  return result.flat(Infinity);
+}
+function getController(id) {
+  return getShadow(document.body).filter(x => {
+    return (
+      x.attributes["data-vscid"] &&
+      x.tagName == "DIV" &&
+      x.attributes["data-vscid"].value == `${id}`
+    );
+  })[0];
+}
+
 function initializeNow(document) {
+  log("Begin initializeNow", 5);
   if (!tc.settings.enabled) return;
   // enforce init-once due to redundant callers
-      if (!document.body || document.body.classList.contains('vsc-initialized')) {
+  if (!document.body || document.body.classList.contains("vsc-initialized")) {
     return;
   }
-      document.body.classList.add('vsc-initialized');
+  try {
+    setupListener();
+  } catch {
+    // no operation
+  }
+  document.body.classList.add("vsc-initialized");
+  log("initializeNow: vsc-initialized added to document body", 5);
 
   if (document === window.document) {
     defineVideoController();
   } else {
-        var link = document.createElement('link');
+    var link = document.createElement("link");
-        link.href = chrome.runtime.getURL('inject.css');
+    link.href = chrome.runtime.getURL("inject.css");
-        link.type = 'text/css';
+    link.type = "text/css";
-        link.rel = 'stylesheet';
+    link.rel = "stylesheet";
     document.head.appendChild(link);
   }
-      var docs = Array(document)
+  var docs = Array(document);
   try {
-        if (inIframe())
+    if (inIframe()) docs.push(window.top.document);
-          docs.push(window.top.document);
+  } catch (e) {}
-      } catch (e) {
-      }
 
   docs.forEach(function(doc) {
-        doc.addEventListener('keydown', function(event) {
+    doc.addEventListener(
+      "keydown",
+      function(event) {
         var keyCode = event.keyCode;
+        log("Processing keydown event: " + keyCode, 6);
 
         // Ignore if following modifier is active.
-          if (!event.getModifierState
+        if (
-              || event.getModifierState("Alt")
+          !event.getModifierState ||
-              || event.getModifierState("Control")
+          event.getModifierState("Alt") ||
-              || event.getModifierState("Fn")
+          event.getModifierState("Control") ||
-              || event.getModifierState("Meta")
+          event.getModifierState("Fn") ||
-              || event.getModifierState("Hyper")
+          event.getModifierState("Meta") ||
-              || event.getModifierState("OS")) {
+          event.getModifierState("Hyper") ||
+          event.getModifierState("OS")
+        ) {
+          log("Keydown event ignored due to active modifier: " + keyCode, 5);
           return;
         }
 
         // Ignore keydown event if typing in an input box
-          if (event.target.nodeName === 'INPUT'
+        if (
-              || event.target.nodeName === 'TEXTAREA'
+          event.target.nodeName === "INPUT" ||
-              || event.target.isContentEditable) {
+          event.target.nodeName === "TEXTAREA" ||
+          event.target.isContentEditable
+        ) {
           return false;
         }
 
         // Ignore keydown event if typing in a page without vsc
-          if (!document.querySelector(".vsc-controller")) {
+        if (
+          !getShadow(document.body).filter(x => x.tagName == "vsc-controller")
+        ) {
           return false;
         }
 
         var item = tc.settings.keyBindings.find(item => item.key === keyCode);
         if (item) {
           runAction(item.action, document, item.value);
-          if (item.force === "true") {// disable websites key bindings
+          if (item.force === "true") {
+            // disable websites key bindings
             event.preventDefault();
             event.stopPropagation();
           }
         }
 
         return false;
-        }, true);
+      },
+      true
+    );
   });
 
-
   function checkForVideo(node, parent, added) {
     // Only proceed with supposed removal if node is missing from DOM
     if (!added && document.body.contains(node)) {
       return;
     }
-        if (node.nodeName === 'VIDEO' || (node.nodeName === 'AUDIO' && tc.settings.audioBoolean)) {
+    if (
+      node.nodeName === "VIDEO" ||
+      (node.nodeName === "AUDIO" && tc.settings.audioBoolean)
+    ) {
       if (added) {
         node.vsc = new tc.videoController(node, parent);
       } else {
-            let id = node.dataset['vscid'];
+        let id = node.dataset["vscid"];
         if (id) {
           node.vsc.remove();
         }
@@ -422,46 +573,93 @@
 
   var observer = new MutationObserver(function(mutations) {
     // Process the DOM nodes lazily
-        requestIdleCallback(_ => {
+    requestIdleCallback(
+      _ => {
         mutations.forEach(function(mutation) {
+          switch (mutation.type) {
+            case "childList":
               forEach.call(mutation.addedNodes, function(node) {
-              if (typeof node === "function")
+                if (typeof node === "function") return;
-                return;
                 checkForVideo(node, node.parentNode || mutation.target, true);
               });
               forEach.call(mutation.removedNodes, function(node) {
-              if (typeof node === "function")
+                if (typeof node === "function") return;
-                return;
                 checkForVideo(node, node.parentNode || mutation.target, false);
               });
+              break;
+            case "attributes":
+              if (
+                mutation.target.attributes["aria-hidden"] &&
+                mutation.target.attributes["aria-hidden"].value == "false"
+              ) {
+                var flattenedNodes = getShadow(document.body);
+                var node = flattenedNodes.filter(x => x.tagName == "VIDEO")[0];
+                if (node) {
+                  var oldController = flattenedNodes.filter(x =>
+                    x.classList.contains("vsc-controller")
+                  )[0];
+                  if (oldController) {
+                    oldController.remove();
+                    if (node.vsc) {
+                      delete node.dataset.vscid;
+                      delete node.vsc;
+                    }
+                  }
+                  checkForVideo(node, node.parentNode || mutation.target, true);
+                }
+              }
+              break;
+          }
         });
-        }, {timeout: 1000});
+      },
+      { timeout: 1000 }
+    );
+  });
+  observer.observe(document, {
+    attributeFilter: ["aria-hidden"],
+    childList: true,
+    subtree: true
   });
-      observer.observe(document, { childList: true, subtree: true });
 
   if (tc.settings.audioBoolean) {
-        var mediaTags = document.querySelectorAll('video,audio');
+    var mediaTags = document.querySelectorAll("video,audio");
   } else {
-        var mediaTags = document.querySelectorAll('video');
+    var mediaTags = document.querySelectorAll("video");
   }
 
   forEach.call(mediaTags, function(video) {
     video.vsc = new tc.videoController(video);
   });
 
-      var frameTags = document.getElementsByTagName('iframe');
+  var frameTags = document.getElementsByTagName("iframe");
   forEach.call(frameTags, function(frame) {
     // Ignore frames we don't have permission to access (different origin).
-        try { var childDocument = frame.contentDocument } catch (e) { return }
+    try {
+      var childDocument = frame.contentDocument;
+    } catch (e) {
+      return;
+    }
     initializeWhenReady(childDocument);
   });
+  log("End initializeNow", 5);
+}
+
+function setSpeed(controller, video, speed) {
+  log("setSpeed started: " + speed, 5);
+  var speedvalue = speed.toFixed(2);
+  video.playbackRate = Number(speedvalue);
+  refreshCoolDown();
+  log("setSpeed finished: " + speed, 5);
 }
 
 function runAction(action, document, value, e) {
+  log("runAction Begin", 5);
   if (tc.settings.audioBoolean) {
-      var mediaTags = document.querySelectorAll('video,audio');
+    var mediaTags = getShadow(document.body).filter(x => {
+      return x.tagName == "AUDIO" || x.tagName == "VIDEO";
+    });
   } else {
-      var mediaTags = document.querySelectorAll('video');
+    var mediaTags = getShadow(document.body).filter(x => x.tagName == "VIDEO");
   }
 
   mediaTags.forEach = Array.prototype.forEach;
@@ -472,9 +670,8 @@
   }
 
   mediaTags.forEach(function(v) {
-      var id = v.dataset['vscid'];
+    var id = v.dataset["vscid"];
-      var controller = document.querySelector(`div[data-vscid="${id}"]`);
+    var controller = getController(id);
-
     // Don't change video speed if the video has a different controller
     if (e && !(targetController == controller)) {
       return;
@@ -485,75 +682,98 @@
       showController(controller);
     }
 
-      if (!v.classList.contains('vsc-cancelled')) {
+    if (!v.classList.contains("vsc-cancelled")) {
-        if (action === 'rewind') {
+      if (action === "rewind") {
+        log("Rewind", 5);
         v.currentTime -= value;
-        } else if (action === 'advance') {
+      } else if (action === "advance") {
+        log("Fast forward", 5);
         v.currentTime += value;
-        } else if (action === 'faster') {
+      } else if (action === "faster") {
+        log("Increase speed", 5);
         // Maximum playback speed in Chrome is set to 16:
         // https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/html/media/html_media_element.cc?gsn=kMinRate&l=166
-          var s = Math.min((v.playbackRate < 0.1 ? 0.0 : v.playbackRate) + value, 16);
+        var s = Math.min(
-          v.playbackRate = Number(s.toFixed(2));
+          (v.playbackRate < 0.1 ? 0.0 : v.playbackRate) + value,
-        } else if (action === 'slower') {
+          16
+        );
+        setSpeed(controller, v, s);
+      } else if (action === "slower") {
+        log("Decrease speed", 5);
         // Video min rate is 0.0625:
         // https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/html/media/html_media_element.cc?gsn=kMinRate&l=165
         var s = Math.max(v.playbackRate - value, 0.07);
-          v.playbackRate = Number(s.toFixed(2));
+        setSpeed(controller, v, s);
-        } else if (action === 'reset') {
+      } else if (action === "reset") {
-          resetSpeed(v, 1.0);
+        log("Reset speed", 5);
-        } else if (action === 'display') {
+        resetSpeed(v, controller, 1.0);
-          controller.classList.add('vsc-manual');
+      } else if (action === "display") {
-          controller.classList.toggle('vsc-hidden');
+        log("Showing controller", 5);
-        } else if (action === 'blink') {
+        controller.classList.add("vsc-manual");
+        controller.classList.toggle("vsc-hidden");
+      } else if (action === "blink") {
+        log("Showing controller momentarily", 5);
         // if vsc is hidden, show it briefly to give the use visual feedback that the action is excuted.
-            if(controller.classList.contains('vsc-hidden') || controller.blinkTimeOut !== undefined){
+        if (
+          controller.classList.contains("vsc-hidden") ||
+          controller.blinkTimeOut !== undefined
+        ) {
           clearTimeout(controller.blinkTimeOut);
-              controller.classList.remove('vsc-hidden');
+          controller.classList.remove("vsc-hidden");
-              controller.blinkTimeOut = setTimeout(()=>{
+          controller.blinkTimeOut = setTimeout(
-                controller.classList.add('vsc-hidden');
+            () => {
+              controller.classList.add("vsc-hidden");
               controller.blinkTimeOut = undefined;
-              }, value ? value : 1000);
+            },
+            value ? value : 1000
+          );
         }
-        } else if (action === 'drag') {
+      } else if (action === "drag") {
         handleDrag(v, controller, e);
-        } else if (action === 'fast') {
+      } else if (action === "fast") {
-          resetSpeed(v, value);
+        resetSpeed(v, controller, value);
-        } else if (action === 'pause') {
+      } else if (action === "pause") {
         pause(v);
-        } else if (action === 'muted') {
+      } else if (action === "muted") {
         muted(v, value);
-        } else if (action === 'mark') {
+      } else if (action === "mark") {
         setMark(v);
-        } else if (action === 'jump') {
+      } else if (action === "jump") {
         jumpToMark(v);
       }
     }
   });
+  log("runAction End", 5);
 }
 
 function pause(v) {
   if (v.paused) {
+    log("Resuming video", 5);
     v.play();
   } else {
+    log("Pausing video", 5);
     v.pause();
   }
 }
 
-  function resetSpeed(v, target) {
+function resetSpeed(v, controller, target) {
   if (v.playbackRate === target) {
-      if (v.playbackRate === getKeyBindings("reset")) { // resetSpeed
+    if (v.playbackRate === getKeyBindings("reset")) {
       if (target !== 1.0) {
-          v.playbackRate = 1.0;
+        log("Resetting playback speed to 1.0", 4);
+        setSpeed(controller, v, 1.0);
       } else {
-          v.playbackRate = getKeyBindings("fast");  // fastSpeed
+        log('Toggling playback speed to "fast" speed', 4);
+        setSpeed(controller, v, getKeyBindings("fast"));
       }
     } else {
-        v.playbackRate = getKeyBindings("reset"); // resetSpeed
+      log('Toggling playback speed to "reset" speed', 4);
+      setSpeed(controller, v, getKeyBindings("reset"));
     }
   } else {
-      setKeyBindings("reset", v.playbackRate);  // resetSpeed
+    log('Toggling playback speed to "reset" speed', 4);
-      v.playbackRate = target;
+    setKeyBindings("reset", v.playbackRate);
+    setSpeed(controller, v, target);
   }
 }
 
@@ -562,28 +782,32 @@
 }
 
 function setMark(v) {
+  log("Adding marker", 5);
   v.vsc.mark = v.currentTime;
 }
 
 function jumpToMark(v) {
+  log("Recalling marker", 5);
   if (v.vsc.mark && typeof v.vsc.mark === "number") {
     v.currentTime = v.vsc.mark;
   }
 }
 
 function handleDrag(video, controller, e) {
-    const shadowController = controller.shadowRoot.querySelector('#controller');
+  const shadowController = controller.shadowRoot.querySelector("#controller");
 
   // Find nearest parent of same size as video parent.
   var parentElement = controller.parentElement;
-    while (parentElement.parentNode &&
+  while (
+    parentElement.parentNode &&
     parentElement.parentNode.offsetHeight === parentElement.offsetHeight &&
-      parentElement.parentNode.offsetWidth === parentElement.offsetWidth) {
+    parentElement.parentNode.offsetWidth === parentElement.offsetWidth
+  ) {
     parentElement = parentElement.parentNode;
   }
 
-    video.classList.add('vcs-dragging');
+  video.classList.add("vcs-dragging");
-    shadowController.classList.add('dragging');
+  shadowController.classList.add("dragging");
 
   const initialMouseXY = [e.clientX, e.clientY];
   const initialControllerXY = [
@@ -591,39 +815,40 @@
     parseInt(shadowController.style.top)
   ];
 
-    const startDragging = (e) => {
+  const startDragging = e => {
     let style = shadowController.style;
     let dx = e.clientX - initialMouseXY[0];
     let dy = e.clientY - initialMouseXY[1];
-      style.left = (initialControllerXY[0] + dx) + 'px';
+    style.left = initialControllerXY[0] + dx + "px";
-      style.top  = (initialControllerXY[1] + dy) + 'px';
+    style.top = initialControllerXY[1] + dy + "px";
-    }
+  };
 
   const stopDragging = () => {
-      parentElement.removeEventListener('mousemove', startDragging);
+    parentElement.removeEventListener("mousemove", startDragging);
-      parentElement.removeEventListener('mouseup', stopDragging);
+    parentElement.removeEventListener("mouseup", stopDragging);
-      parentElement.removeEventListener('mouseleave', stopDragging);
+    parentElement.removeEventListener("mouseleave", stopDragging);
 
-      shadowController.classList.remove('dragging');
+    shadowController.classList.remove("dragging");
-      video.classList.remove('vcs-dragging');
+    video.classList.remove("vcs-dragging");
-    }
+  };
 
-    parentElement.addEventListener('mouseup',stopDragging);
+  parentElement.addEventListener("mouseup", stopDragging);
-    parentElement.addEventListener('mouseleave',stopDragging);
+  parentElement.addEventListener("mouseleave", stopDragging);
-    parentElement.addEventListener('mousemove', startDragging);
+  parentElement.addEventListener("mousemove", startDragging);
 }
 
 var timer;
 var animation = false;
 function showController(controller) {
-    controller.classList.add('vcs-show');
+  log("Showing controller", 4);
+  controller.classList.add("vcs-show");
 
-    if (animation)
+  if (animation) clearTimeout(timer);
-      clearTimeout(timer);
 
   animation = true;
   timer = setTimeout(function() {
-      controller.classList.remove('vcs-show');
+    controller.classList.remove("vcs-show");
     animation = false;
+    log("Hiding controller", 5);
   }, 2000);
 }

manifest.json

@@ -1,9 +1,9 @@
 {
   "name": "Video Speed Controller",
   "short_name": "videospeed",
-  "version": "0.5.9.1",
+  "version": "0.6.1",
   "manifest_version": 2,
-  "description": "Speed up, slow down, advance and rewind any HTML5 video with quick shortcuts.",
+  "description": "Speed up, slow down, advance and rewind HTML5 audio/video with shortcuts",
   "homepage_url": "https://github.com/codebicycle/videospeed",
   "browser_specific_settings": {
     "gecko": {
@@ -28,22 +28,19 @@
     },
     "default_popup": "popup.html"
   },
-  "content_scripts": [{
+  "content_scripts": [
+    {
       "all_frames": true,
       "matches": ["http://*/*", "https://*/*", "file:///*"],
       "match_about_blank": true,
       "exclude_matches": [
         "https://plus.google.com/hangouts/*",
         "https://hangouts.google.com/*",
-        "https://meet.google.com/*",
+        "https://meet.google.com/*"
-        "https://teamtreehouse.com/*",
-        "http://www.hitbox.tv/*"
       ],
       "css": ["inject.css"],
       "js": ["inject.js"]
     }
   ],
-  "web_accessible_resources": [
+  "web_accessible_resources": ["inject.css", "shadow.css"]
-    "inject.css", "shadow.css"
-  ]
 }

options.css

@@ -7,7 +7,9 @@ body {
   color: rgb(48, 57, 66);
 }
 
-h1, h2, h3 {
+h1,
+h2,
+h3 {
   font-weight: normal;
   line-height: 1;
   user-select: none;
@@ -31,10 +33,11 @@ header {
   top: 0;
   left: 15px;
   right: 0;
-	border-bottom: 1px solid #EEE;
+  border-bottom: 1px solid #eee;
   background: linear-gradient(white, white 40%, rgba(255, 255, 255, 0.92));
 }
-header, section {
+header,
+section {
   min-width: 600px;
   max-width: 738px;
 }
@@ -56,11 +59,12 @@ button {
   min-width: 4em;
   min-height: 2em;
 
-	background-image: linear-gradient(#EDEDED, #EDEDED 38%, #DEDEDE);
+  background-image: linear-gradient(#ededed, #ededed 38%, #dedede);
   border: 1px solid rgba(0, 0, 0, 0.25);
   border-radius: 2px;
   outline: none;
-	box-shadow: 0 1px 0 rgba(0,0,0,0.08), inset 0 1px 2px rgba(255,255,255,0.75);
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.08),
+    inset 0 1px 2px rgba(255, 255, 255, 0.75);
   color: #444;
   text-shadow: 0 1px 0 rgb(240, 240, 240);
   font: inherit;
@@ -68,7 +72,6 @@ button {
   user-select: none;
 }
 
-
 input[type="text"] {
   width: 75px;
   text-align: center;
@@ -85,7 +88,7 @@ label {
 }
 
 #status {
-    color: #9D9D9D;
+  color: #9d9d9d;
   display: inline-block;
   margin-left: 50px;
 }

options.html

@@ -16,72 +16,119 @@
         <select class="customDo">
           <option value="display">Show/hide controller</option>
         </select>
-            <input class="customKey" type="text" value="" placeholder="press a key">
+        <input
-            <input class="customValue" type="text" placeholder="value (0.10)">
+          class="customKey"
+          type="text"
+          value=""
+          placeholder="press a key"
+        />
+        <input class="customValue" type="text" placeholder="value (0.10)" />
         <select class="customForce">
           <option value="false">Do not disable website key bindings</option>
-                <option value="true">Disable websites key bindings</option>
+          <option value="true">Disable website key bindings</option>
-            </select></div>
+        </select>
+      </div>
       <div class="row customs" id="slower">
         <select class="customDo">
           <option value="slower">Decrease speed</option>
         </select>
-            <input class="customKey" type="text" value="" placeholder="press a key">
+        <input
-            <input class="customValue" type="text" placeholder="value (0.10)">
+          class="customKey"
+          type="text"
+          value=""
+          placeholder="press a key"
+        />
+        <input class="customValue" type="text" placeholder="value (0.10)" />
         <select class="customForce">
           <option value="false">Do not disable website key bindings</option>
-                <option value="true">Disable websites key bindings</option>
+          <option value="true">Disable website key bindings</option>
-            </select></div>
+        </select>
+      </div>
       <div class="row customs" id="faster">
         <select class="customDo">
           <option value="faster">Increase speed</option>
         </select>
-            <input class="customKey" type="text" value="" placeholder="press a key">
+        <input
-                <input class="customValue" type="text" placeholder="value (0.10)">
+          class="customKey"
+          type="text"
+          value=""
+          placeholder="press a key"
+        />
+        <input class="customValue" type="text" placeholder="value (0.10)" />
         <select class="customForce">
           <option value="false">Do not disable website key bindings</option>
-                <option value="true">Disable websites key bindings</option>
+          <option value="true">Disable website key bindings</option>
-            </select></div>
+        </select>
+      </div>
       <div class="row customs" id="rewind">
         <select class="customDo">
           <option value="rewind">Rewind</option>
         </select>
-            <input class="customKey" type="text" value="" placeholder="press a key">
+        <input
-            <input class="customValue" type="text" placeholder="value (10)">
+          class="customKey"
+          type="text"
+          value=""
+          placeholder="press a key"
+        />
+        <input class="customValue" type="text" placeholder="value (10)" />
         <select class="customForce">
           <option value="false">Do not disable website key bindings</option>
-                <option value="true">Disable websites key bindings</option>
+          <option value="true">Disable website key bindings</option>
-            </select></div>
+        </select>
+      </div>
       <div class="row customs" id="advance">
         <select class="customDo">
           <option value="advance">Advance</option>
         </select>
-            <input class="customKey" type="text" value="" placeholder="press a key">
+        <input
-            <input class="customValue" type="text" placeholder="value (10)">
+          class="customKey"
+          type="text"
+          value=""
+          placeholder="press a key"
+        />
+        <input class="customValue" type="text" placeholder="value (10)" />
         <select class="customForce">
           <option value="false">Do not disable website key bindings</option>
-                <option value="true">Disable websites key bindings</option>
+          <option value="true">Disable website key bindings</option>
-            </select></div>
+        </select>
+      </div>
       <div class="row customs" id="reset">
         <select class="customDo">
           <option value="reset">Reset speed</option>
         </select>
-            <input class="customKey" type="text" value="" placeholder="press a key">
+        <input
-            <input class="customValue" type="text" placeholder="value (1.00)" disabled>
+          class="customKey"
+          type="text"
+          value=""
+          placeholder="press a key"
+        />
+        <input
+          class="customValue"
+          type="text"
+          placeholder="value (1.00)"
+          disabled
+        />
         <select class="customForce">
           <option value="false">Do not disable website key bindings</option>
-                <option value="true">Disable websites key bindings</option>
+          <option value="true">Disable website key bindings</option>
-            </select></div>
+        </select>
+      </div>
       <div class="row customs" id="fast">
         <select class="customDo">
           <option value="fast">Preferred speed</option>
         </select>
-            <input class="customKey" type="text" value="" placeholder="press a key">
+        <input
-            <input class="customValue" type="text" placeholder="value (1.80)">
+          class="customKey"
+          type="text"
+          value=""
+          placeholder="press a key"
+        />
+        <input class="customValue" type="text" placeholder="value (1.80)" />
         <select class="customForce">
           <option value="false">Do not disable website key bindings</option>
-                <option value="true">Disable websites key bindings</option>
+          <option value="true">Disable website key bindings</option>
-            </select></div>
+        </select>
+      </div>
 
       <button id="add">Add New</button>
     </section>
@@ -89,7 +136,7 @@
     <section>
       <h3>Other</h3>
       <div class="row">
-        <label for="enabled">Enabled</label>
+        <label for="enabled">Enable</label>
         <input id="enabled" type="checkbox" />
       </div>
       <div class="row">
@@ -97,7 +144,7 @@
         <input id="startHidden" type="checkbox" />
       </div>
       <div class="row">
-        <label for="rememberSpeed">Remember Playback Speed</label>
+        <label for="rememberSpeed">Remember playback speed</label>
         <input id="rememberSpeed" type="checkbox" />
       </div>
       <div class="row">
@@ -106,14 +153,18 @@
       </div>
       <div class="row">
         <label for="controllerOpacity">Controller opacity</label>
-        <input id="controllerOpacity" type="text" value="">
+        <input id="controllerOpacity" type="text" value="" />
       </div>
       <div class="row">
-        <label for="blacklist">Blacklisted sites on which extension is disabled<br/>
+        <label for="blacklist"
+          >Sites on which extension is disabled<br />
           (one per line)<br />
           <br />
-            <em><a href="https://www.regexpal.com/">Regex</a> is supported. Be sure it is in "//g" format.<br/>
+          <em>
-            ie: /(.+)youtube\.com(\/*)$/gi</em>
+            <a href="https://www.regexpal.com/">Regex</a> is supported.<br />
+            Be sure it is in "//g" format.<br />
+            ie: /(.+)youtube\.com(\/*)$/gi
+          </em>
         </label>
         <textarea id="blacklist" rows="10" cols="50"></textarea>
       </div>
@@ -121,16 +172,22 @@
 
     <button id="save">Save</button>
     <button id="restore">Restore Defaults</button>
-    <button id="experimental">Show experimental features</button>
+    <button id="experimental">Show Experimental Features</button>
 
     <div id="status"></div>
 
     <div id="faq">
       <hr />
 
-      <h4>The video controls are not showing up?</h4>
+      <h4>Extension controls not appearing?</h4>
-      <p>This extension is only compatible with HTML5 video. If you don't see the controls showing up, chances are you are viewing a Flash video. If you want to confirm, try right-clicking on the video and inspect the menu: if it mentions flash, then that's the issue. That said, <b>most sites will fallback to HTML5</b> if they detect that Flash is not available. You can try manually disabling Flash from the browser.</p>
+      <p>
-
+        This extension is only compatible with HTML5 audio and video. If you don't
+        see the controls showing up, chances are you are viewing a Flash content.
+        If you want to confirm, try right-clicking on the content and inspect the
+        menu: if it mentions flash, then that's the issue. That said, <b>most sites
+        will fallback to HTML5</b> if they detect that Flash is not available. You
+        can try manually disabling Flash from the browser.
+      </p>
     </div>
   </body>
 </html>

options.js

@@ -17,87 +17,89 @@ var tcDefaults = {
     { action: "reset", key: 82, value: 1, force: false, predefined: true }, // R
     { action: "fast", key: 71, value: 1.8, force: false, predefined: true } // G
   ],
-  blacklist: `
+  blacklist:
-    www.instagram.com
+   `www.instagram.com
     twitter.com
-    vine.co
     imgur.com
     teams.microsoft.com
-  `.replace(regStrip, '')
+  `.replace(regStrip, "")
 };
 
 var keyBindings = [];
 
 var keyCodeAliases = {
-  0: 'null',
+  0: "null",
-  null: 'null',
+  null: "null",
-  undefined: 'null',
+  undefined: "null",
-  32: 'Space',
+  32: "Space",
-  37: 'Left',
+  37: "Left",
-  38: 'Up',
+  38: "Up",
-  39: 'Right',
+  39: "Right",
-  40: 'Down',
+  40: "Down",
-  96: 'Num 0',
+  96: "Num 0",
-  97: 'Num 1',
+  97: "Num 1",
-  98: 'Num 2',
+  98: "Num 2",
-  99: 'Num 3',
+  99: "Num 3",
-  100: 'Num 4',
+  100: "Num 4",
-  101: 'Num 5',
+  101: "Num 5",
-  102: 'Num 6',
+  102: "Num 6",
-  103: 'Num 7',
+  103: "Num 7",
-  104: 'Num 8',
+  104: "Num 8",
-  105: 'Num 9',
+  105: "Num 9",
-  106: 'Num *',
+  106: "Num *",
-  107: 'Num +',
+  107: "Num +",
-  109: 'Num -',
+  109: "Num -",
-  110: 'Num .',
+  110: "Num .",
-  111: 'Num /',
+  111: "Num /",
-  112: 'F1',
+  112: "F1",
-  113: 'F2',
+  113: "F2",
-  114: 'F3',
+  114: "F3",
-  115: 'F4',
+  115: "F4",
-  116: 'F5',
+  116: "F5",
-  117: 'F6',
+  117: "F6",
-  118: 'F7',
+  118: "F7",
-  119: 'F8',
+  119: "F8",
-  120: 'F9',
+  120: "F9",
-  121: 'F10',
+  121: "F10",
-  122: 'F11',
+  122: "F11",
-  123: 'F12',
+  123: "F12",
-  186: ';',
+  186: ";",
-  188: '<',
+  188: "<",
-  189: '-',
+  189: "-",
-  187: '+',
+  187: "+",
-  190: '>',
+  190: ">",
-  191: '/',
+  191: "/",
-  192: '~',
+  192: "~",
-  219: '[',
+  219: "[",
-  220: '\\',
+  220: "\\",
-  221: ']',
+  221: "]",
-  222: '\'',
+  222: "'",
-  59:  ';',
+  59:  ";",
-  61:  '+',
+  61:  "+",
-  173: '-',
+  173: "-",
-}
+};
 
 function recordKeyPress(e) {
   if (
-    (e.keyCode >= 48 && e.keyCode <= 57)    // Numbers 0-9
+    (e.keyCode >= 48 && e.keyCode <= 57) || // Numbers 0-9
-    || (e.keyCode >= 65 && e.keyCode <= 90) // Letters A-Z
+    (e.keyCode >= 65 && e.keyCode <= 90) || // Letters A-Z
-    || keyCodeAliases[e.keyCode]            // Other character keys
+    keyCodeAliases[e.keyCode] // Other character keys
   ) {
-    e.target.value = keyCodeAliases[e.keyCode] || String.fromCharCode(e.keyCode);
+    e.target.value =
+      keyCodeAliases[e.keyCode] || String.fromCharCode(e.keyCode);
     e.target.keyCode = e.keyCode;
 
     e.preventDefault();
     e.stopPropagation();
-  } else if (e.keyCode === 8) { // Clear input when backspace pressed
+  } else if (e.keyCode === 8) {
-    e.target.value = '';
+    // Clear input when backspace pressed
-  } else if (e.keyCode === 27) { // When esc clicked, clear input
+    e.target.value = "";
-    e.target.value = 'null';
+  } else if (e.keyCode === 27) {
+    // When esc clicked, clear input
+    e.target.value = "null";
     e.target.keyCode = null;
   }
-};
+}
 
 function inputFilterNumbersOnly(e) {
   var char = String.fromCharCode(e.keyCode);
@@ -105,18 +107,20 @@ function inputFilterNumbersOnly(e) {
     e.preventDefault();
     e.stopPropagation();
   }
-};
+}
 
 function inputFocus(e) {
   e.target.value = "";
-};
+}
 
 function inputBlur(e) {
-  e.target.value = keyCodeAliases[e.target.keyCode] || String.fromCharCode(e.target.keyCode);
+  e.target.value =
-};
+    keyCodeAliases[e.target.keyCode] || String.fromCharCode(e.target.keyCode);
+}
 
 function updateShortcutInputText(inputId, keyCode) {
-  document.getElementById(inputId).value = keyCodeAliases[keyCode] || String.fromCharCode(keyCode);
+  document.getElementById(inputId).value =
+    keyCodeAliases[keyCode] || String.fromCharCode(keyCode);
   document.getElementById(inputId).keyCode = keyCode;
 }
 
@@ -146,14 +150,17 @@ function add_shortcut() {
     <input class="customValue" type="text" placeholder="value (0.10)"/>
     <select class="customForce">
     <option value="false">Do not disable website key bindings</option>
-    <option value="true">Disable websites key bindings</option>
+    <option value="true">Disable website key bindings</option>
     </select>
     <button class="removeParent">X</button>`;
-  var div = document.createElement('div');
+  var div = document.createElement("div");
-  div.setAttribute('class', 'row customs');
+  div.setAttribute("class", "row customs");
   div.innerHTML = html;
   var customs_element = document.getElementById("customs");
-  customs_element.insertBefore(div, customs_element.children[customs_element.childElementCount - 1]);
+  customs_element.insertBefore(
+    div,
+    customs_element.children[customs_element.childElementCount - 1]
+  );
 }
 
 function createKeyBindings(item) {
@@ -163,26 +170,35 @@ function createKeyBindings(item) {
   const force = item.querySelector(".customForce").value;
   const predefined = !!item.id; //item.id ? true : false;
 
-  keyBindings.push({action: action, key: key, value: value, force: force, predefined: predefined});
+  keyBindings.push({
+    action: action,
+    key: key,
+    value: value,
+    force: force,
+    predefined: predefined
+  });
 }
 
 // Validates settings before saving
 function validate() {
   var valid = true;
-  var status = document.getElementById('status');
+  var status = document.getElementById("status");
-  document.getElementById('blacklist').value.split("\n").forEach(match => {
+  document
-    match = match.replace(regStrip,'')
+    .getElementById("blacklist")
-    if (match.startsWith('/')) {
+    .value.split("\n")
+    .forEach(match => {
+      match = match.replace(regStrip, "");
+      if (match.startsWith("/")) {
         try {
           var regexp = new RegExp(match);
         } catch (err) {
-        status.textContent = 'Error: Invalid Regex: ' + match
+          status.textContent =
-                           + '. Unable to save';
+            "Error: Invalid blacklist regex: " + match + ". Unable to save";
           valid = false;
           return;
         }
       }
-  })
+    });
   return valid;
 }
 
@@ -192,47 +208,70 @@ function save_options() {
     return;
   }
   keyBindings = [];
-  Array.from(document.querySelectorAll(".customs")).forEach(item => createKeyBindings(item)); // Remove added shortcuts
+  Array.from(document.querySelectorAll(".customs")).forEach(item =>
+    createKeyBindings(item)
+  ); // Remove added shortcuts
 
-  var rememberSpeed = document.getElementById('rememberSpeed').checked;
+  var rememberSpeed = document.getElementById("rememberSpeed").checked;
-  var audioBoolean = document.getElementById('audioBoolean').checked;
+  var audioBoolean = document.getElementById("audioBoolean").checked;
-  var enabled = document.getElementById('enabled').checked;
+  var enabled = document.getElementById("enabled").checked;
-  var startHidden = document.getElementById('startHidden').checked;
+  var startHidden = document.getElementById("startHidden").checked;
-  var controllerOpacity = document.getElementById('controllerOpacity').value;
+  var controllerOpacity = document.getElementById("controllerOpacity").value;
-  var blacklist     = document.getElementById('blacklist').value;
+  var blacklist = document.getElementById("blacklist").value;
 
-  chrome.storage.sync.remove(["resetSpeed", "speedStep", "fastSpeed", "rewindTime", "advanceTime", "resetKeyCode", "slowerKeyCode", "fasterKeyCode", "rewindKeyCode", "advanceKeyCode", "fastKeyCode"]);
+  chrome.storage.sync.remove([
-  chrome.storage.sync.set({
+    "resetSpeed",
+    "speedStep",
+    "fastSpeed",
+    "rewindTime",
+    "advanceTime",
+    "resetKeyCode",
+    "slowerKeyCode",
+    "fasterKeyCode",
+    "rewindKeyCode",
+    "advanceKeyCode",
+    "fastKeyCode"
+  ]);
+  chrome.storage.sync.set(
+    {
       rememberSpeed: rememberSpeed,
       audioBoolean: audioBoolean,
       enabled: enabled,
       startHidden: startHidden,
       controllerOpacity: controllerOpacity,
       keyBindings: keyBindings,
-    blacklist:      blacklist.replace(regStrip,'')
+      blacklist: blacklist.replace(regStrip, "")
-  }, function() {
+    },
+    function() {
       // Update status to let user know options were saved.
-    var status = document.getElementById('status');
+      var status = document.getElementById("status");
-    status.textContent = 'Options saved';
+      status.textContent = "Options saved";
       setTimeout(function() {
-      status.textContent = '';
+        status.textContent = "";
       }, 1000);
-  });
+    }
+  );
 }
 
 // Restores options from chrome.storage
 function restore_options() {
   chrome.storage.sync.get(tcDefaults, function(storage) {
-    document.getElementById('rememberSpeed').checked = storage.rememberSpeed;
+    document.getElementById("rememberSpeed").checked = storage.rememberSpeed;
-    document.getElementById('audioBoolean').checked = storage.audioBoolean;
+    document.getElementById("audioBoolean").checked = storage.audioBoolean;
-    document.getElementById('enabled').checked = storage.enabled;
+    document.getElementById("enabled").checked = storage.enabled;
-    document.getElementById('startHidden').checked = storage.startHidden;
+    document.getElementById("startHidden").checked = storage.startHidden;
-    document.getElementById('controllerOpacity').value = storage.controllerOpacity;
+    document.getElementById("controllerOpacity").value =
-    document.getElementById('blacklist').value = storage.blacklist;
+      storage.controllerOpacity;
+    document.getElementById("blacklist").value = storage.blacklist;
 
     // ensure that there is a "display" binding for upgrades from versions that had it as a separate binding
     if (storage.keyBindings.filter(x => x.action == "display").length == 0) {
-      storage.keyBindings.push({ action: "display", value: 0, force: false, predefined: true });
+      storage.keyBindings.push({
+        action: "display",
+        value: 0,
+        force: false,
+        predefined: true
+      });
     }
 
     for (let i in storage.keyBindings) {
@@ -240,27 +279,36 @@ function restore_options() {
       if (item.predefined) {
         //do predefined ones because their value needed for overlay
         // document.querySelector("#" + item["action"] + " .customDo").value = item["action"];
-        if (item["action"] == "display" && typeof (item["key"]) === "undefined"){
+        if (item["action"] == "display" && typeof item["key"] === "undefined") {
           item["key"] = storage.displayKeyCode || tcDefaults.displayKeyCode; // V
         }
 
         if (customActionsNoValues.includes(item["action"]))
-          document.querySelector("#" + item["action"] + " .customValue").disabled = true;
+          document.querySelector(
+            "#" + item["action"] + " .customValue"
+          ).disabled = true;
 
-        updateCustomShortcutInputText(document.querySelector("#" + item["action"] + " .customKey"), item["key"]);
+        updateCustomShortcutInputText(
-        document.querySelector("#" + item["action"] + " .customValue").value = item["value"];
+          document.querySelector("#" + item["action"] + " .customKey"),
-        document.querySelector("#" + item["action"] + " .customForce").value = item["force"];
+          item["key"]
-      }
+        );
-      else {
+        document.querySelector("#" + item["action"] + " .customValue").value =
+          item["value"];
+        document.querySelector("#" + item["action"] + " .customForce").value =
+          item["force"];
+      } else {
         // new ones
         add_shortcut();
-        const dom = document.querySelector(".customs:last-of-type")
+        const dom = document.querySelector(".customs:last-of-type");
         dom.querySelector(".customDo").value = item["action"];
 
         if (customActionsNoValues.includes(item["action"]))
           dom.querySelector(".customValue").disabled = true;
 
-        updateCustomShortcutInputText(dom.querySelector(".customKey"), item["key"]);
+        updateCustomShortcutInputText(
+          dom.querySelector(".customKey"),
+          item["key"]
+        );
         dom.querySelector(".customValue").value = item["value"];
         dom.querySelector(".customForce").value = item["force"];
       }
@@ -271,53 +319,61 @@ function restore_options() {
 function restore_defaults() {
   chrome.storage.sync.set(tcDefaults, function() {
     restore_options();
-    document.querySelectorAll(".removeParent").forEach(button => button.click()); // Remove added shortcuts
+    document
+      .querySelectorAll(".removeParent")
+      .forEach(button => button.click()); // Remove added shortcuts
     // Update status to let user know options were saved.
-    var status = document.getElementById('status');
+    var status = document.getElementById("status");
-    status.textContent = 'Default options restored';
+    status.textContent = "Default options restored";
     setTimeout(function() {
-      status.textContent = '';
+      status.textContent = "";
     }, 1000);
   });
 }
 
 function show_experimental() {
-  document.querySelectorAll(".customForce").forEach(item => item.style.display = 'inline-block');
+  document
+    .querySelectorAll(".customForce")
+    .forEach(item => (item.style.display = "inline-block"));
 }
 
-document.addEventListener('DOMContentLoaded', function () {
+document.addEventListener("DOMContentLoaded", function() {
   restore_options();
 
-  document.getElementById('save').addEventListener('click', save_options);
+  document.getElementById("save").addEventListener("click", save_options);
-  document.getElementById('add').addEventListener('click', add_shortcut);
+  document.getElementById("add").addEventListener("click", add_shortcut);
-  document.getElementById('restore').addEventListener('click', restore_defaults);
+  document
-  document.getElementById('experimental').addEventListener('click', show_experimental);
+    .getElementById("restore")
+    .addEventListener("click", restore_defaults);
+  document
+    .getElementById("experimental")
+    .addEventListener("click", show_experimental);
 
   function eventCaller(event, className, funcName) {
     if (!event.target.classList.contains(className)) {
-      return
+      return;
     }
     funcName(event);
   }
 
-  document.addEventListener('keypress', (event) => {
+  document.addEventListener("keypress", event => {
-    eventCaller(event, "customValue", inputFilterNumbersOnly)
+    eventCaller(event, "customValue", inputFilterNumbersOnly);
   });
-  document.addEventListener('focus', (event) => {
+  document.addEventListener("focus", event => {
-    eventCaller(event, "customKey", inputFocus)
+    eventCaller(event, "customKey", inputFocus);
   });
-  document.addEventListener('blur', (event) => {
+  document.addEventListener("blur", event => {
-    eventCaller(event, "customKey", inputBlur)
+    eventCaller(event, "customKey", inputBlur);
   });
-  document.addEventListener('keydown', (event) => {
+  document.addEventListener("keydown", event => {
-    eventCaller(event, "customKey", recordKeyPress)
+    eventCaller(event, "customKey", recordKeyPress);
   });
-  document.addEventListener('click', (event) => {
+  document.addEventListener("click", event => {
     eventCaller(event, "removeParent", function() {
-      event.target.parentNode.remove()
+      event.target.parentNode.remove();
-    })
     });
-  document.addEventListener('change', (event) => {
+  });
+  document.addEventListener("change", event => {
     eventCaller(event, "customDo", function() {
       if (customActionsNoValues.includes(event.target.value)) {
         event.target.nextElementSibling.nextElementSibling.disabled = true;
@@ -325,6 +381,6 @@ document.addEventListener('DOMContentLoaded', function () {
       } else {
         event.target.nextElementSibling.nextElementSibling.disabled = false;
       }
-    })
     });
-})
+  });
+});

popup.css

@@ -1,5 +1,5 @@
 body {
-  min-width: 8em
+  min-width: 8em;
 }
 
 hr {
@@ -12,11 +12,12 @@ hr {
 
 button {
   width: 100%;
-  background-image: linear-gradient(#EDEDED, #EDEDED 38%, #DEDEDE);
+  background-image: linear-gradient(#ededed, #ededed 38%, #dedede);
   border: 1px solid rgba(0, 0, 0, 0.25);
   border-radius: 2px;
   outline: none;
-  box-shadow: 0 1px 0 rgba(0,0,0,0.08), inset 0 1px 2px rgba(255,255,255,0.75);
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.08),
+    inset 0 1px 2px rgba(255, 255, 255, 0.75);
   color: #444;
   text-shadow: 0 1px 0 rgb(240, 240, 240);
   font: inherit;

popup.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <title>Video Speed Controller: Popup</title>

popup.js

@@ -1,5 +1,5 @@
-document.addEventListener('DOMContentLoaded', function () {
+document.addEventListener("DOMContentLoaded", function() {
-  document.querySelector('#config').addEventListener('click', function() {
+  document.querySelector("#config").addEventListener("click", function() {
     window.open(chrome.runtime.getURL("options.html"));
   });
   
@@ -11,11 +11,11 @@ document.addEventListener('DOMContentLoaded', function () {
     window.open("https://github.com/codebicycle/videospeed/issues");
   });
 
-  document.querySelector('#enable').addEventListener('click', function() {
+  document.querySelector("#enable").addEventListener("click", function() {
     toggleEnabled(true, settingsSavedReloadMessage);
   });
 
-  document.querySelector('#disable').addEventListener('click', function() {
+  document.querySelector("#disable").addEventListener("click", function() {
     toggleEnabled(false, settingsSavedReloadMessage);
   });
 
@@ -24,21 +24,24 @@ document.addEventListener('DOMContentLoaded', function () {
   });
 
   function toggleEnabled(enabled, callback) {
-    chrome.storage.sync.set({
+    chrome.storage.sync.set(
-      enabled: enabled,
+      {
-    }, function() {
+        enabled: enabled
+      },
+      function() {
         toggleEnabledUI(enabled);
         if (callback) callback(enabled);
-    });
+      }
+    );
   }
 
   function toggleEnabledUI(enabled) {
-    document.querySelector('#enable').classList.toggle("hide", enabled);
+    document.querySelector("#enable").classList.toggle("hide", enabled);
-    document.querySelector('#disable').classList.toggle("hide", !enabled);
+    document.querySelector("#disable").classList.toggle("hide", !enabled);
 
-    const suffix = `${(enabled ? "" : "_disabled")}.png`
+    const suffix = `${enabled ? "" : "_disabled"}.png`;
     chrome.browserAction.setIcon({
-      "path": {
+      path: {
         "19": "icons/icon19" + suffix,
         "38": "icons/icon38" + suffix,
         "48": "icons/icon48" + suffix
@@ -47,11 +50,13 @@ document.addEventListener('DOMContentLoaded', function () {
   }
 
   function settingsSavedReloadMessage(enabled) {
-    setStatusMessage(`${enabled ? "Enabled" : "Disabled"}. Reload page to see changes`);
+    setStatusMessage(
+      `${enabled ? "Enabled" : "Disabled"}. Reload page to see changes`
+    );
   }
 
   function setStatusMessage(str) {
-    const status_element = document.querySelector('#status')
+    const status_element = document.querySelector("#status");
     status_element.classList.toggle("hide", false);
     status_element.innerText = str;
   }

shadow.css

@@ -75,7 +75,7 @@ button:focus {
 }
 
 button:hover {
-  opacity: 1.0;
+  opacity: 1;
 }
 
 button:active {