Added ratechange blocklist to fix #72 #521 and #584

inject.js

@@ -18,7 +18,12 @@ var tc = {
       vine.co
       imgur.com
       teams.microsoft.com
-      `.replace(regStrip, "")
+    `.replace(regStrip, ""),
+    blacklistrc: `\
+      twitch.tv
+      pluralsight.com
+      teamtreehouse.com
+    `.replace(regStrip, "")
   }
 };
 
@@ -80,7 +85,8 @@ chrome.storage.sync.get(tc.settings, function(storage) {
       startHidden: tc.settings.startHidden,
       enabled: tc.settings.enabled,
       controllerOpacity: tc.settings.controllerOpacity,
-      blacklist: tc.settings.blacklist.replace(regStrip, "")
+      blacklist: tc.settings.blacklist.replace(regStrip, ""),
+      blacklistrc: tc.settings.blacklistrc.replace(regStrip, "")
     });
   }
   tc.settings.lastSpeed = Number(storage.lastSpeed);
@@ -91,6 +97,7 @@ chrome.storage.sync.get(tc.settings, function(storage) {
   tc.settings.startHidden = Boolean(storage.startHidden);
   tc.settings.controllerOpacity = Number(storage.controllerOpacity);
   tc.settings.blacklist = String(storage.blacklist);
+  tc.settings.blacklistrc = String(storage.blacklistrc);
 
   // ensure that there is a "display" binding (for upgrades from versions that had it as a separate binding)
   if (tc.settings.keyBindings.filter(x => x.action == "display").length == 0) {
@@ -306,13 +313,13 @@ function defineVideoController() {
   };
 }
 
-function initializeWhenReady(document) {
-  escapeStringRegExp.matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
-  function escapeStringRegExp(str) {
-    return str.replace(escapeStringRegExp.matchOperatorsRe, "\\$&");
-  }
+function escapeStringRegExp(str) {
+  matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+  return str.replace(matchOperatorsRe, "\\$&");
+}
 
-  var blacklisted = false;
+function isBlacklisted() {
+  blacklisted = false;
   tc.settings.blacklist.split("\n").forEach(match => {
     match = match.replace(regStrip, "");
     if (match.length == 0) {
@@ -334,9 +341,46 @@ function initializeWhenReady(document) {
       return;
     }
   });
+  return blacklisted;
+}
 
-  if (blacklisted) return;
+function isRateChangeBlocked() {
+  blockRateChange = false;
+  tc.settings.blacklistrc.split("\n").forEach(match => {
+    match = match.replace(regStrip, "");
+    if (match.length == 0) {
+      return;
+    }
+    if (match.startsWith("/")) {
+      try {
+        var regexp = new RegExp(match);
+      } catch (err) {
+        return;
+      }
+    } else {
+      var regexp = new RegExp(escapeStringRegExp(match));
+    }
+    if (regexp.test(location.href)) {
+      blockRateChange = true;
+      return;
+    }
+  });
+  return blockRateChange;
+}
 
+function initializeWhenReady(document) {
+  if (isBlacklisted()) {
+    return;
+  }
+  if (isRateChangeBlocked()) {
+    document.body.addEventListener(
+      "ratechange",
+      function(event) {
+        event.stopImmediatePropagation();
+      },
+      true
+    );
+  }
   window.onload = () => {
     initializeNow(window.document);
   };
@@ -502,8 +546,10 @@ function initializeNow(document) {
               });
               break;
             case "attributes":
-              if (mutation.target.attributes["aria-hidden"] &&
-                mutation.target.attributes["aria-hidden"].value == "false") {
+              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) {
@@ -551,6 +597,13 @@ function initializeNow(document) {
   });
 }
 
+function setSpeed(controller, video, speed) {
+  var speedvalue = speed.toFixed(2);
+  video.playbackRate = Number(speedvalue);
+  var speedIndicator = controller.shadowRoot.querySelector("span");
+  speedIndicator.textContent = speedvalue;
+}
+
 function runAction(action, document, value, e) {
   if (tc.settings.audioBoolean) {
     var mediaTags = getShadow(document.body).filter(x => {
@@ -592,14 +645,14 @@ function runAction(action, document, value, e) {
           (v.playbackRate < 0.1 ? 0.0 : v.playbackRate) + value,
           16
         );
-        v.playbackRate = Number(s.toFixed(2));
+        setSpeed(controller, v, s);
       } else if (action === "slower") {
         // 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") {
-        resetSpeed(v, 1.0);
+        resetSpeed(v, controller, 1.0);
       } else if (action === "display") {
         controller.classList.add("vsc-manual");
         controller.classList.toggle("vsc-hidden");
@@ -622,7 +675,7 @@ function runAction(action, document, value, e) {
       } else if (action === "drag") {
         handleDrag(v, controller, e);
       } else if (action === "fast") {
-        resetSpeed(v, value);
+        resetSpeed(v, controller, value);
       } else if (action === "pause") {
         pause(v);
       } else if (action === "muted") {
@@ -644,21 +697,21 @@ function pause(v) {
   }
 }
 
-function resetSpeed(v, target) {
+function resetSpeed(v, controller, target) {
   if (v.playbackRate === target) {
     if (v.playbackRate === getKeyBindings("reset")) {
       // resetSpeed
       if (target !== 1.0) {
-        v.playbackRate = 1.0;
+        setSpeed(controller, v, 1.0);
       } else {
-        v.playbackRate = getKeyBindings("fast"); // fastSpeed
+        setSpeed(controller, v, getKeyBindings("fast")); // fastSpeed
       }
     } else {
-      v.playbackRate = getKeyBindings("reset"); // resetSpeed
+      setSpeed(controller, v, getKeyBindings("reset")); // resetSpeed
     }
   } else {
     setKeyBindings("reset", v.playbackRate); // resetSpeed
-    v.playbackRate = target;
+    setSpeed(controller, v, target);
   }
 }