Better speed controlling logic, more selective speed reapplication

README.md

@@ -1,3 +1,7 @@
+[![Add to Firefox](https://img.shields.io/badge/Add%20to-Firefox-orange?logo=firefox&logoColor=white)](https://addons.mozilla.org/en-US/firefox/addon/video-speed-controller-v1/)
+
+
+
 # The science of accelerated playback
 
 **TL;DR: faster playback translates to better engagement and retention.**
@@ -74,10 +78,10 @@ You can try manually disabling Flash from the browser.
 [`igrigorik/videospeed`](https://github.com/igrigorik/videospeed) repository
 is a port of [`igrigorik`](https://github.com/igrigorik)'s videospeed Chrome 
 add-on for Firefox. This fork modifies the Chrome add-on code so that it works 
-in Firefox. This repo is the code behind the [Firefox Extension](https://addons.mozilla.org/en-us/firefox/addon/videospeed/)
+in Firefox. This repo is the code behind the [Firefox Extension](https://addons.mozilla.org/en-US/firefox/addon/video-speed-controller-v1/)
 whereas the [`igrigorik/videospeed`](https://github.com/igrigorik/videospeed)
 repository contains the code behind the [Chrome Extension](https://chrome.google.com/webstore/detail/video-speed-controller/nffaoalbilbmmfgbnbgppjihopabppdk).
 
 ### License
 
-(MIT License) - Copyright (c) 2014 Ilya Grigorik
+(MIT License) - Copyright (c) 2025 Josh Patra

build.py

@@ -0,0 +1,118 @@
+import glob
+import os
+import re
+import shutil
+import tempfile
+import zipfile
+
+SCRIPT_NAME = os.path.basename(__file__)
+TARGET_FILE = "manifest.json"
+
+
+def zip_folder(output_name, folder, exclude_files, exclude_dirs):
+    with zipfile.ZipFile(output_name, "w", zipfile.ZIP_DEFLATED) as zipf:
+        for root, dirs, files in os.walk(folder):
+            dirs[:] = [
+                d
+                for d in dirs
+                if os.path.relpath(os.path.join(root, d), folder) not in exclude_dirs
+            ]
+            for file in files:
+                rel_path = os.path.relpath(os.path.join(root, file), folder)
+                if (
+                    file in exclude_files
+                    or rel_path in exclude_files
+                    or any(rel_path.startswith(ed + os.sep) for ed in exclude_dirs)
+                ):
+                    continue
+                zipf.write(os.path.join(root, file), arcname=rel_path)
+
+
+def update_version_line(file_path, new_version):
+    with open(file_path, "r", encoding="utf-8") as f:
+        lines = f.readlines()
+
+    updated = False
+    for i, line in enumerate(lines):
+        match = re.match(r'\s*"version":\s*"([^"]+)"', line)
+        if match:
+            old_version = match.group(1)
+            lines[i] = re.sub(
+                r'"version":\s*".+?"', f'"version": "{new_version}"', line
+            )
+            updated = True
+            print(
+                f"🛠️ Changed version in {file_path} from {old_version} ➜ {new_version}"
+            )
+            break
+
+    if updated:
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.writelines(lines)
+    else:
+        print(f"⚠️ No version line found in {file_path}.")
+
+
+def main():
+    # Step 0: Remove all existing .xpi files upfront
+    xpi_files = glob.glob("*.xpi")
+    for f in xpi_files:
+        try:
+            os.remove(f)
+            print(f"🗑️ Removed existing archive: {f}")
+        except Exception as e:
+            print(f"⚠️ Failed to remove {f}: {e}")
+
+    base_version = input("Enter the new base version (e.g., 2.0.1): ").strip()
+    if not base_version:
+        print("❌ No version entered. Exiting.")
+        return
+
+    firefox_version = f"{base_version}.0"
+    current_dir = os.getcwd()
+    manifest_path = os.path.join(current_dir, TARGET_FILE)
+
+    # Step 1: Update manifest.json on disk to base_version
+    if os.path.exists(manifest_path):
+        update_version_line(manifest_path, base_version)
+    else:
+        print(f"❌ {TARGET_FILE} not found. Aborting.")
+        return
+
+    # Step 2: Create videospeed-github.xpi (exclude script, .git, AND videospeed-github.xpi itself)
+    exclude_files = [SCRIPT_NAME, "videospeed-github.xpi"]
+    exclude_dirs = [".git"]
+    zip_folder("videospeed-github.xpi", current_dir, exclude_files, exclude_dirs)
+    print("✅ Created videospeed-github.xpi")
+
+    # Step 3: Re-scan for .xpi files after GitHub archive creation, exclude them for Firefox zip
+    current_xpi_files = set(glob.glob("*.xpi"))
+    exclude_temp_files = current_xpi_files.union({SCRIPT_NAME})
+    exclude_temp_dirs = set(exclude_dirs)
+
+    # Step 4: Create videospeed-firefox.xpi from temp folder with version bumped to .0
+    with tempfile.TemporaryDirectory() as temp_dir:
+        for item in os.listdir(current_dir):
+            if item in exclude_temp_files or item in exclude_temp_dirs:
+                continue
+            src = os.path.join(current_dir, item)
+            dst = os.path.join(temp_dir, item)
+            if os.path.isdir(src):
+                shutil.copytree(src, dst)
+            else:
+                shutil.copy2(src, dst)
+
+        temp_manifest = os.path.join(temp_dir, TARGET_FILE)
+        if os.path.exists(temp_manifest):
+            update_version_line(temp_manifest, firefox_version)
+        else:
+            print(f"⚠️ {TARGET_FILE} not found in temp folder.")
+
+        zip_folder(
+            "videospeed-firefox.xpi", temp_dir, exclude_files=[], exclude_dirs=[]
+        )
+        print("✅ Created videospeed-firefox.xpi")
+
+
+if __name__ == "__main__":
+    main()

inject.js

@@ -1,17 +1,19 @@
 var regStrip = /^[\r\t\f\v ]+|[\r\t\f\v ]+$/gm;
 
+var isUserSeek = false; // Track if seek was user-initiated
+var lastToggleSpeed = {}; // Store last toggle speeds per video
+
 var tc = {
   settings: {
-    lastSpeed: 1.0, // default 1x
+    lastSpeed: 1.0,
-    enabled: true, // default enabled
+    enabled: true,
-    speeds: {}, // empty object to hold speed for each source
+    speeds: {},
-
+    displayKeyCode: 86,
-    displayKeyCode: 86, // default: V
+    rememberSpeed: false,
-    rememberSpeed: false, // default: false
+    forceLastSavedSpeed: false,
-    forceLastSavedSpeed: false, //default: false
+    audioBoolean: false,
-    audioBoolean: false, // default: false
+    startHidden: false,
-    startHidden: false, // default: false
+    controllerOpacity: 0.3,
-    controllerOpacity: 0.3, // default: 0.3
     keyBindings: [],
     blacklist: `\
       www.instagram.com
@@ -21,36 +23,26 @@ var tc = {
       teams.microsoft.com
     `.replace(regStrip, ""),
     defaultLogLevel: 4,
-    logLevel: 3,
+    logLevel: 5, // Set to 5 to see your debug logs
-    // --- Nudge settings (ADDED) ---
     enableSubtitleNudge: true,
     subtitleNudgeInterval: 25,
     subtitleNudgeAmount: 0.001
   },
-
-  // Holds a reference to all of the AUDIO/VIDEO DOM elements we've attached to
   mediaElements: [],
-  isNudging: false // Flag for nudge operation (ADDED)
+  isNudging: false
 };
 
-/* Log levels (depends on caller specifying the correct level) */
+/* Log levels */
 function log(message, level) {
   verbosity = tc.settings.logLevel;
-  if (typeof level === "undefined") {
+  if (typeof level === "undefined") level = tc.settings.defaultLogLevel;
-    level = tc.settings.defaultLogLevel;
-  }
   if (verbosity >= level) {
-    // MODIFIED: Added [VSC] prefix for clarity
     let prefix = "[VSC] ";
-    if (level === 2) {
+    if (level === 2) console.log(prefix + "ERROR: " + message);
-      console.log(prefix + "ERROR: " + message);
+    else if (level === 3) console.log(prefix + "WARNING: " + message);
-    } else if (level === 3) {
+    else if (level === 4) console.log(prefix + "INFO: " + message);
-      console.log(prefix + "WARNING: " + message);
+    else if (level === 5) console.log(prefix + "DEBUG: " + message);
-    } else if (level === 4) {
+    else if (level === 6) {
-      console.log(prefix + "INFO: " + message);
-    } else if (level === 5) {
-      console.log(prefix + "DEBUG: " + message);
-    } else if (level === 6) {
       console.log(prefix + "DEBUG (VERBOSE): " + message);
       console.trace();
     }
@@ -58,225 +50,187 @@ function log(message, level) {
 }
 
 chrome.storage.sync.get(tc.settings, function (storage) {
-  // MODIFIED: Robust keyBinding initialization from storage or defaults.
+  // Original initialization from your code
-  tc.settings.keyBindings =
+  tc.settings.keyBindings = storage.keyBindings;
-    Array.isArray(storage.keyBindings) &&
+  if (storage.keyBindings.length == 0) {
-    storage.keyBindings.length > 0 &&
+    tc.settings.keyBindings.push({
-    storage.keyBindings[0].hasOwnProperty("predefined")
+      action: "slower",
-      ? storage.keyBindings
+      key: Number(storage.slowerKeyCode) || 83,
-      : [
+      value: Number(storage.speedStep) || 0.1,
-          {
+      force: false,
-            action: "slower",
+      predefined: true
-            key: Number(storage.slowerKeyCode) || 83,
+    });
-            value: Number(storage.speedStep) || 0.1,
+    tc.settings.keyBindings.push({
-            force: false,
+      action: "faster",
-            predefined: true
+      key: Number(storage.fasterKeyCode) || 68,
-          },
+      value: Number(storage.speedStep) || 0.1,
-          {
+      force: false,
-            action: "faster",
+      predefined: true
-            key: Number(storage.fasterKeyCode) || 68,
+    });
-            value: Number(storage.speedStep) || 0.1,
+    tc.settings.keyBindings.push({
-            force: false,
+      action: "rewind",
-            predefined: true
+      key: Number(storage.rewindKeyCode) || 90,
-          },
+      value: Number(storage.rewindTime) || 10,
-          {
+      force: false,
-            action: "rewind",
+      predefined: true
-            key: Number(storage.rewindKeyCode) || 90,
+    });
-            value: Number(storage.rewindTime) || 10,
+    tc.settings.keyBindings.push({
-            force: false,
+      action: "advance",
-            predefined: true
+      key: Number(storage.advanceKeyCode) || 88,
-          },
+      value: Number(storage.advanceTime) || 10,
-          {
+      force: false,
-            action: "advance",
+      predefined: true
-            key: Number(storage.advanceKeyCode) || 88,
+    });
-            value: Number(storage.advanceTime) || 10,
+    tc.settings.keyBindings.push({
-            force: false,
+      action: "reset",
-            predefined: true
+      key: Number(storage.resetKeyCode) || 82,
-          },
+      value: 1.0,
-          {
+      force: false,
-            action: "reset",
+      predefined: true
-            key: Number(storage.resetKeyCode) || 82,
+    });
-            value: 1.0,
+    tc.settings.keyBindings.push({
-            force: false,
+      action: "fast",
-            predefined: true
+      key: Number(storage.fastKeyCode) || 71,
-          }, // Default value for reset action is 1.0
+      value: Number(storage.fastSpeed) || 1.8,
-          {
+      force: false,
-            action: "fast",
+      predefined: true
-            key: Number(storage.fastKeyCode) || 71,
+    });
-            value: Number(storage.fastSpeed) || 1.8,
+    tc.settings.version = "0.5.3";
-            force: false,
-            predefined: true
-          }
-        ];
-  if (
-    !Array.isArray(storage.keyBindings) ||
-    storage.keyBindings.length === 0 ||
-    (storage.keyBindings.length > 0 &&
-      !storage.keyBindings[0].hasOwnProperty("predefined"))
-  ) {
-    log("Initializing/Updating keybindings in storage.", 4);
     chrome.storage.sync.set({
       keyBindings: tc.settings.keyBindings,
-      version: "0.6.3.8"
+      version: tc.settings.version,
-    }); // Update version
+      displayKeyCode: tc.settings.displayKeyCode,
+      rememberSpeed: tc.settings.rememberSpeed,
+      forceLastSavedSpeed: tc.settings.forceLastSavedSpeed,
+      audioBoolean: tc.settings.audioBoolean,
+      startHidden: tc.settings.startHidden,
+      enabled: tc.settings.enabled,
+      controllerOpacity: tc.settings.controllerOpacity,
+      blacklist: tc.settings.blacklist.replace(regStrip, "")
+    });
   }
-
+  tc.settings.lastSpeed = Number(storage.lastSpeed);
-  tc.settings.lastSpeed = Number(storage.lastSpeed) || 1.0;
+  tc.settings.displayKeyCode = Number(storage.displayKeyCode);
-  tc.settings.displayKeyCode = Number(storage.displayKeyCode) || 86;
   tc.settings.rememberSpeed = Boolean(storage.rememberSpeed);
   tc.settings.forceLastSavedSpeed = Boolean(storage.forceLastSavedSpeed);
   tc.settings.audioBoolean = Boolean(storage.audioBoolean);
-  tc.settings.enabled =
+  tc.settings.enabled = Boolean(storage.enabled);
-    typeof storage.enabled !== "undefined" ? Boolean(storage.enabled) : true;
   tc.settings.startHidden = Boolean(storage.startHidden);
-  tc.settings.controllerOpacity = Number(storage.controllerOpacity) || 0.3;
+  tc.settings.controllerOpacity = Number(storage.controllerOpacity);
-  tc.settings.blacklist = String(storage.blacklist || tc.settings.blacklist);
+  tc.settings.blacklist = String(storage.blacklist);
-
-  if (typeof storage.logLevel !== "undefined") {
-    tc.settings.logLevel = Number(storage.logLevel);
-  }
-  // ADDED: Load nudge settings from storage
   tc.settings.enableSubtitleNudge =
     typeof storage.enableSubtitleNudge !== "undefined"
       ? Boolean(storage.enableSubtitleNudge)
       : tc.settings.enableSubtitleNudge;
   tc.settings.subtitleNudgeInterval =
-    Number(storage.subtitleNudgeInterval) || 25; // Using 25ms as requested
+    Number(storage.subtitleNudgeInterval) || 25;
   tc.settings.subtitleNudgeAmount =
     Number(storage.subtitleNudgeAmount) || tc.settings.subtitleNudgeAmount;
-
   if (
     tc.settings.keyBindings.filter((x) => x.action == "display").length == 0
   ) {
     tc.settings.keyBindings.push({
       action: "display",
-      key: tc.settings.displayKeyCode,
+      key: Number(storage.displayKeyCode) || 86,
       value: 0,
       force: false,
       predefined: true
     });
   }
-
   initializeWhenReady(document);
 });
 
 function getKeyBindings(action, what = "value") {
-  if (!tc.settings.keyBindings) return false; // ADDED: Guard against undefined keyBindings
   try {
-    const binding = tc.settings.keyBindings.find(
+    return tc.settings.keyBindings.find((item) => item.action === action)[what];
-      (item) => item.action === action
-    );
-    if (binding) return binding[what];
-    // Fallback defaults for safety
-    if (what === "value") {
-      if (action === "slower" || action === "faster") return 0.1;
-      if (action === "rewind" || action === "advance") return 10;
-      if (action === "reset") return 1.0;
-      if (action === "fast") return 1.8;
-    }
-    return false;
   } catch (e) {
-    log(`Error in getKeyBindings for ${action} (${what}): ${e.message}`, 2);
     return false;
   }
 }
-
-// Original setKeyBindings, used by original resetSpeed logic.
 function setKeyBindings(action, value) {
-  if (!tc.settings.keyBindings) return; // ADDED: Guard
+  tc.settings.keyBindings.find((item) => item.action === action)["value"] =
-  const binding = tc.settings.keyBindings.find(
+    value;
-    (item) => item.action === action
-  );
-  if (binding) {
-    binding["value"] = value;
-    log(
-      `In-memory value for keyBinding '${action}' set to ${value} by original setKeyBindings func`,
-      6
-    );
-  }
 }
 
 function defineVideoController() {
   tc.videoController = function (target, parent) {
-    if (target.vsc) {
+    if (target.vsc) return target.vsc;
-      log(`VSC controller already exists for ${target.src || "video"}.`, 6);
-      return target.vsc;
-    }
-    log(`Creating VSC controller for ${target.src || "video"}.`, 4);
-
     tc.mediaElements.push(target);
     target.vsc = this;
-
     this.video = target;
-    this.parent = parent || target.parentElement;
+    this.parent = target.parentElement || parent;
-    this.nudgeIntervalId = null; // ADDED: For the subtitle nudge feature
+    this.nudgeIntervalId = null;
 
-    // Original logic for determining initial speed
+    // Determine what speed to use
-    let storedSpeed;
+    let storedSpeed = tc.settings.speeds[target.currentSrc];
     if (!tc.settings.rememberSpeed) {
-      storedSpeed = tc.settings.speeds[target.currentSrc];
       if (!storedSpeed) {
-        log(
-          "Overwriting stored speed to 1.0 due to rememberSpeed being disabled or no speed for src",
-          5
-        );
         storedSpeed = 1.0;
       }
-      setKeyBindings("reset", getKeyBindings("fast")); // Original logic for 'R' key toggle state
     } else {
-      log("Recalling stored speed due to rememberSpeed being enabled", 5);
+      storedSpeed = tc.settings.lastSpeed;
-      storedSpeed =
-        tc.settings.speeds[target.currentSrc] || tc.settings.lastSpeed;
     }
     if (tc.settings.forceLastSavedSpeed) {
       storedSpeed = tc.settings.lastSpeed;
     }
 
+    // FIXED: Actually apply the speed to the video element
+    // Use setSpeed function to properly set the speed with all the necessary logic
+    setTimeout(() => {
+      if (this.video && this.video.vsc) {
+        setSpeed(this.video, storedSpeed, true, false);
+      }
+    }, 0);
+
     this.div = this.initializeControls();
 
-    if (Math.abs(target.playbackRate - storedSpeed) > 0.001) {
+    // Make the controller visible for 5 seconds on startup
-      log(
+    runAction("blink", 5000, null, this.video);
-        `Video current rate ${target.playbackRate.toFixed(2)} differs from VSC target ${storedSpeed.toFixed(2)}. Setting speed (initial).`,
-        4
-      );
-      setSpeed(target, storedSpeed, true); // MODIFIED: Pass true for isInitialSet
-    } else {
-      if (this.speedIndicator)
-        this.speedIndicator.textContent = storedSpeed.toFixed(2);
-      if (
-        !tc.settings.forceLastSavedSpeed &&
-        tc.settings.lastSpeed !== storedSpeed
-      ) {
-        tc.settings.lastSpeed = storedSpeed;
-      }
-    }
 
-    // Original mediaEventAction
+    // Rewritten mediaEventAction to prevent speed reset on pause.
     var mediaEventAction = function (event) {
-      const video = event.target;
+      // Handle subtitle nudging based on the event type first.
-      if (!video.vsc) return;
+      if (event.type === "play") {
+        this.startSubtitleNudge();
 
-      let speedToSet = tc.settings.speeds[video.currentSrc]; // Use 'let'
+        // FIXED: Only reapply speed if there's a significant mismatch AND it's a new video
-      if (!tc.settings.rememberSpeed) {
+        const currentSpeed = event.target.playbackRate;
-        if (!speedToSet) speedToSet = 1.0;
+        const videoId =
-        setKeyBindings("reset", getKeyBindings("fast"));
+          event.target.currentSrc || event.target.src || "default";
-      } else {
-        speedToSet = tc.settings.lastSpeed;
-      }
-      if (tc.settings.forceLastSavedSpeed) speedToSet = tc.settings.lastSpeed;
 
-      if (Math.abs(video.playbackRate - speedToSet) > 0.001) {
+        // Get the expected speed based on settings
-        log(
+        let expectedSpeed;
-          `Media event '${event.type}': rate ${video.playbackRate.toFixed(2)} vs target ${speedToSet.toFixed(2)}. Setting.`,
+        if (tc.settings.forceLastSavedSpeed) {
-          4
+          expectedSpeed = tc.settings.lastSpeed;
-        );
+        } else {
-        setSpeed(video, speedToSet, false); // MODIFIED: isInitialSet is false
+          expectedSpeed = tc.settings.speeds[videoId] || tc.settings.lastSpeed;
+        }
+
+        // Only reapply speed if:
+        // 1. The current speed is 1.0 (default) AND we have a stored speed that's different
+        // 2. OR if forceLastSavedSpeed is enabled and speeds don't match
+        const shouldReapplySpeed =
+          (Math.abs(currentSpeed - 1.0) < 0.01 &&
+            Math.abs(expectedSpeed - 1.0) > 0.01) ||
+          (tc.settings.forceLastSavedSpeed &&
+            Math.abs(currentSpeed - expectedSpeed) > 0.01);
+
+        if (shouldReapplySpeed) {
+          setTimeout(() => {
+            if (event.target.vsc) {
+              setSpeed(event.target, expectedSpeed, false, false);
+            }
+          }, 10);
+        }
+      } else if (event.type === "pause" || event.type === "ended") {
+        this.stopSubtitleNudge();
       }
 
-      // ADDED: Manage nudge based on event type
+      // For seek events, don't mess with speed
-      if (event.type === "play") video.vsc.startSubtitleNudge();
+      if (event.type === "seeked" && isUserSeek) {
-      else if (event.type === "pause" || event.type === "ended")
+        isUserSeek = false;
-        video.vsc.stopSubtitleNudge();
+        return;
+      }
     };
 
     target.addEventListener(
@@ -286,16 +240,41 @@ function defineVideoController() {
     target.addEventListener(
       "pause",
       (this.handlePause = mediaEventAction.bind(this))
-    ); // ADDED for nudge
+    );
     target.addEventListener(
       "ended",
       (this.handleEnded = mediaEventAction.bind(this))
-    ); // ADDED for nudge
+    );
     target.addEventListener(
       "seeked",
       (this.handleSeek = mediaEventAction.bind(this))
     );
 
+    // ADDITIONAL FIX: Listen for loadedmetadata to reapply speed when video source changes
+    target.addEventListener("loadedmetadata", () => {
+      if (this.video && this.video.vsc) {
+        const currentSpeed = this.video.playbackRate;
+        const videoId = this.video.currentSrc || this.video.src || "default";
+
+        // Get expected speed
+        let expectedSpeed;
+        if (tc.settings.forceLastSavedSpeed) {
+          expectedSpeed = tc.settings.lastSpeed;
+        } else {
+          expectedSpeed = tc.settings.speeds[videoId] || tc.settings.lastSpeed;
+        }
+
+        // Only reapply if current speed is default (1.0) and we have a different stored speed
+        const shouldReapplySpeed =
+          Math.abs(currentSpeed - 1.0) < 0.01 &&
+          Math.abs(expectedSpeed - 1.0) > 0.01;
+
+        if (shouldReapplySpeed) {
+          setSpeed(this.video, expectedSpeed, false, false);
+        }
+      }
+    });
+
     var srcObserver = new MutationObserver((mutations) => {
       mutations.forEach((mutation) => {
         if (
@@ -303,54 +282,69 @@ function defineVideoController() {
           (mutation.attributeName === "src" ||
             mutation.attributeName === "currentSrc")
         ) {
-          if (!this.div) return; // MODIFIED: Check if div exists
+          if (this.div) {
-          log(`Src changed to: ${mutation.target.currentSrc || "empty"}`, 4);
+            this.stopSubtitleNudge();
-          this.stopSubtitleNudge(); // ADDED: Stop nudge for old src
+            if (!mutation.target.src && !mutation.target.currentSrc) {
-
+              this.div.classList.add("vsc-nosource");
-          if (!mutation.target.src && !mutation.target.currentSrc) {
-            this.div.classList.add("vsc-nosource");
-          } else {
-            this.div.classList.remove("vsc-nosource");
-            let newSrcSpeed = tc.settings.speeds[mutation.target.currentSrc]; // MODIFIED: Follow original logic
-            if (!tc.settings.rememberSpeed) {
-              if (!newSrcSpeed) newSrcSpeed = 1.0;
             } else {
-              newSrcSpeed = newSrcSpeed || tc.settings.lastSpeed;
+              this.div.classList.remove("vsc-nosource");
-            }
-            if (tc.settings.forceLastSavedSpeed)
-              newSrcSpeed = tc.settings.lastSpeed;
 
-            setSpeed(mutation.target, newSrcSpeed, true); // MODIFIED: isInitialSet = true
+              // FIXED: Reapply speed when source changes (like in shorts)
-            if (!mutation.target.paused && mutation.target.playbackRate !== 1.0)
+              const expectedSpeed = tc.settings.forceLastSavedSpeed
-              this.startSubtitleNudge(); // ADDED
+                ? tc.settings.lastSpeed
+                : tc.settings.speeds[mutation.target.currentSrc] ||
+                  tc.settings.lastSpeed;
+
+              setTimeout(() => {
+                if (mutation.target.vsc) {
+                  setSpeed(mutation.target, expectedSpeed, false, false);
+                }
+              }, 100);
+
+              if (!mutation.target.paused) this.startSubtitleNudge();
+            }
           }
         }
       });
     });
     srcObserver.observe(target, { attributeFilter: ["src", "currentSrc"] });
-
+    if (!target.paused && target.playbackRate !== 1.0)
-    // ADDED: Initial nudge check
-    if (!target.paused && target.playbackRate !== 1.0) {
       this.startSubtitleNudge();
-    }
   };
 
-  // --- Nudge Methods (ADDED) ---
+  tc.videoController.prototype.remove = function () {
+    this.stopSubtitleNudge();
+    if (this.div) this.div.remove();
+    if (this.video) {
+      this.video.removeEventListener("play", this.handlePlay);
+      this.video.removeEventListener("pause", this.handlePause);
+      this.video.removeEventListener("ended", this.handleEnded);
+      this.video.removeEventListener("seeked", this.handleSeek);
+      delete this.video.vsc;
+    }
+    let idx = tc.mediaElements.indexOf(this.video);
+    if (idx != -1) tc.mediaElements.splice(idx, 1);
+  };
+
   tc.videoController.prototype.startSubtitleNudge = function () {
+    const isYouTube =
+      (this.video &&
+        this.video.currentSrc &&
+        this.video.currentSrc.includes("googlevideo.com")) ||
+      location.hostname.includes("youtube.com");
+    if (!isYouTube) return;
     if (
       !tc.settings.enableSubtitleNudge ||
       this.nudgeIntervalId !== null ||
       !this.video
-    )
+    ) {
       return;
+    }
     if (this.video.paused || this.video.playbackRate === 1.0) {
       this.stopSubtitleNudge();
       return;
     }
-    log(
+    log(`Nudge: Starting interval: ${tc.settings.subtitleNudgeInterval}ms.`, 5);
-      `Nudge: Starting for ${this.video.currentSrc || "video"} (Rate: ${this.video.playbackRate.toFixed(2)}) interval: ${tc.settings.subtitleNudgeInterval}ms.`,
-      5
-    );
     this.nudgeIntervalId = setInterval(() => {
       if (
         !this.video ||
@@ -363,10 +357,8 @@ function defineVideoController() {
       }
       const currentRate = this.video.playbackRate;
       const nudgeAmount = tc.settings.subtitleNudgeAmount;
-
       tc.isNudging = true;
       this.video.playbackRate = currentRate + nudgeAmount;
-
       requestAnimationFrame(() => {
         if (
           this.video &&
@@ -382,69 +374,39 @@ function defineVideoController() {
 
   tc.videoController.prototype.stopSubtitleNudge = function () {
     if (this.nudgeIntervalId !== null) {
-      log(
+      log(`Nudge: Stopping.`, 5);
-        `Nudge: Stopping for ${this.video ? this.video.currentSrc || "video" : "detached video"}`,
-        5
-      );
       clearInterval(this.nudgeIntervalId);
       this.nudgeIntervalId = null;
     }
   };
-  // --- End Nudge Methods ---
 
-  tc.videoController.prototype.remove = function () {
-    this.stopSubtitleNudge(); // ADDED
-    // Original remove logic:
-    if (this.div && this.div.parentNode) this.div.remove();
-    if (this.video) {
-      this.video.removeEventListener("play", this.handlePlay);
-      this.video.removeEventListener("pause", this.handlePause); // ADDED
-      this.video.removeEventListener("ended", this.handleEnded); // ADDED
-      this.video.removeEventListener("seeked", this.handleSeek); // MODIFIED: was "seek" in original provided code
-      delete this.video.vsc;
-    }
-    let idx = tc.mediaElements.indexOf(this.video);
-    if (idx !== -1) tc.mediaElements.splice(idx, 1);
-  };
-
-  // Original initializeControls
   tc.videoController.prototype.initializeControls = function () {
-    log("initializeControls Begin", 5);
     const doc = this.video.ownerDocument;
-    const speedForUI = this.video.playbackRate.toFixed(2);
+    const speed = this.video.playbackRate.toFixed(2);
-    var top = Math.max(this.video.offsetTop, 0) + "px",
+    // Fix for videos rendered after page load - use relative positioning
+    var top = "10px",
+      left = "10px";
+
+    // Try to get actual position, but fallback to default if not available
+    if (this.video.offsetTop > 0 || this.video.offsetLeft > 0) {
+      top = Math.max(this.video.offsetTop, 0) + "px";
       left = Math.max(this.video.offsetLeft, 0) + "px";
-    log("Speed variable for UI set to: " + speedForUI, 5);
+    }
     var wrapper = doc.createElement("div");
     wrapper.classList.add("vsc-controller");
     if (!this.video.src && !this.video.currentSrc)
       wrapper.classList.add("vsc-nosource");
     if (tc.settings.startHidden) wrapper.classList.add("vsc-hidden");
     var shadow = wrapper.attachShadow({ mode: "open" });
-    var shadowTemplate = `
+    shadow.innerHTML = `<style> @import "${chrome.runtime.getURL("shadow.css")}"; </style><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><button data-action="slower">−</button><button data-action="faster">+</button><button data-action="advance" class="rw">»</button><button data-action="display" class="hideButton">×</button></span></div>`;
-        <style> @import "${chrome.runtime.getURL("shadow.css")}"; </style>
+    this.speedIndicator = shadow.querySelector(".draggable");
-        <div id="controller" style="top:${top}; left:${left}; opacity:${tc.settings.controllerOpacity}">
-          <span data-action="drag" class="draggable">${speedForUI}</span>
-          <span id="controls">
-            <button data-action="rewind" class="rw">«</button>
-            <button data-action="slower">−</button>
-            <button data-action="faster">+</button>
-            <button data-action="advance" class="rw">»</button>
-            <button data-action="display" class="hideButton">×</button>
-          </span>
-        </div>`;
-    shadow.innerHTML = shadowTemplate;
-    this.speedIndicator = shadow.querySelector(".draggable"); // MODIFIED: Original was "span"
-
-    // MODIFIED: Pass this.video as 4th arg to runAction
     shadow.querySelector(".draggable").addEventListener(
       "mousedown",
       (e) => {
         runAction(
           e.target.dataset["action"],
           getKeyBindings(e.target.dataset["action"], "value"),
-          e,
+          e
-          this.video
         );
         e.stopPropagation();
       },
@@ -457,8 +419,7 @@ function defineVideoController() {
           runAction(
             e.target.dataset["action"],
             getKeyBindings(e.target.dataset["action"]),
-            e,
+            e
-            this.video
           );
           e.stopPropagation();
         },
@@ -478,7 +439,6 @@ function defineVideoController() {
       doc.body.appendChild(fragment);
       return wrapper;
     }
-    // Original placement logic
     switch (true) {
       case location.hostname == "www.amazon.com":
       case location.hostname == "www.reddit.com":
@@ -490,17 +450,12 @@ function defineVideoController() {
           parentEl.parentElement.parentElement.parentElement.parentElement
             .parentElement.parentElement.parentElement;
         if (p && p.firstChild) p.insertBefore(fragment, p.firstChild);
-        else if (parentEl.firstChild)
+        else parentEl.insertBefore(fragment, parentEl.firstChild);
-          parentEl.insertBefore(fragment, parentEl.firstChild);
-        else parentEl.appendChild(fragment);
         break;
       case location.hostname == "tv.apple.com":
-        const appleRoot = parentEl.getRootNode();
+        const r = parentEl.getRootNode();
-        const scrim =
+        const s = r && r.querySelector ? r.querySelector(".scrim") : null;
-          appleRoot && appleRoot.querySelector
+        if (s) s.prepend(fragment);
-            ? appleRoot.querySelector(".scrim")
-            : null;
-        if (scrim) scrim.prepend(fragment);
         else parentEl.insertBefore(fragment, parentEl.firstChild);
         break;
       default:
@@ -511,204 +466,95 @@ function defineVideoController() {
 }
 
 function escapeStringRegExp(str) {
-  const matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+  const m = /[|\\{}()[\]^$+*?.]/g;
-  return str.replace(matchOperatorsRe, "\\$&");
+  return str.replace(m, "\\$&");
 }
 function isBlacklisted() {
-  let blacklisted = false;
+  let b = false;
-  const blacklistLines = tc.settings.blacklist
+  const l = tc.settings.blacklist ? tc.settings.blacklist.split("\n") : [];
-    ? tc.settings.blacklist.split("\n")
+  l.forEach((m) => {
-    : [];
+    if (b) return;
-  blacklistLines.forEach((match) => {
+    m = m.replace(regStrip, "");
-    if (blacklisted) return;
+    if (m.length == 0) return;
-    match = match.replace(regStrip, "");
+    let r;
-    if (match.length == 0) return;
+    if (m.startsWith("/") && m.lastIndexOf("/") > 0) {
-    let regexp;
-    if (match.startsWith("/") && match.lastIndexOf("/") > 0) {
       try {
-        const ls = match.lastIndexOf("/");
+        const ls = m.lastIndexOf("/");
-        regexp = new RegExp(match.substring(1, ls), match.substring(ls + 1));
+        r = new RegExp(m.substring(1, ls), m.substring(ls + 1));
-      } catch (err) {
+      } catch (e) {
-        log(`Invalid regex in blacklist: ${match}. Error: ${err.message}`, 2);
+        log(`Invalid regex: ${m}. ${e.message}`, 2);
         return;
       }
-    } else regexp = new RegExp(escapeStringRegExp(match));
+    } else r = new RegExp(escapeStringRegExp(m));
-    if (regexp && regexp.test(location.href)) blacklisted = true;
+    if (r && r.test(location.href)) b = true;
   });
-  if (blacklisted) log(`Page ${location.href} is blacklisted.`, 4);
+  if (b) log(`Page ${location.href} blacklisted.`, 4);
-  return blacklisted;
+  return b;
 }
-
 var coolDown = false;
 function refreshCoolDown() {
-  log("Begin refreshCoolDown", 5);
   if (coolDown) clearTimeout(coolDown);
   coolDown = setTimeout(function () {
     coolDown = false;
   }, 1000);
-  // log("End refreshCoolDown", 6); // Original log level was 5
 }
 
 function setupListener() {
-  if (document.vscRateListenerAttached) return; // MODIFIED: Ensure flag check
+  if (document.vscRateListenerAttached) return;
-
-  // MODIFIED: fromUserInput parameter added
   function updateSpeedFromEvent(video, fromUserInput = false) {
     if (!video.vsc || !video.vsc.speedIndicator) return;
     var speed = Number(video.playbackRate.toFixed(2));
-    log(
-      `updateSpeedFromEvent: Rate is ${speed}. FromUserInput: ${fromUserInput}`,
-      4
-    );
-
     video.vsc.speedIndicator.textContent = speed.toFixed(2);
     tc.settings.speeds[video.currentSrc || "unknown_src"] = speed;
     tc.settings.lastSpeed = speed;
-    chrome.storage.sync.set({ lastSpeed: speed }, () => {
+    chrome.storage.sync.set({ lastSpeed: speed }, () => {});
-      if (chrome.runtime.lastError)
-        log(`Error saving lastSpeed: ${chrome.runtime.lastError.message}`, 2);
-    });
-
-    // MODIFIED: Only "blink" (show controller) if change was from user input
     if (fromUserInput) {
-      runAction("blink", getKeyBindings("blink", "value") || 1000, null, video);
+      runAction("blink", 1000, null, video);
     }
-
     if (video.vsc) {
-      // MODIFIED: Manage nudge based on new speed
       if (speed === 1.0 || video.paused) video.vsc.stopSubtitleNudge();
       else video.vsc.startSubtitleNudge();
     }
   }
-
   document.addEventListener(
     "ratechange",
     function (event) {
-      // ADDED: Check tc.isNudging at the very start
+      if (tc.isNudging) return;
-      if (tc.isNudging) {
-        // log("Ratechange event during nudge, VSC UI/state update skipped. Allowing propagation for YT.", 6);
-        return;
-      }
-
-      // Original coolDown logic
       if (coolDown) {
-        log("Speed event propagation blocked by coolDown", 4);
         event.stopImmediatePropagation();
         return;
       }
-
       var video = event.target;
       if (!video || typeof video.playbackRate === "undefined" || !video.vsc)
         return;
-
-      const eventOrigin = event.detail && event.detail.origin;
-      let isFromUserInputForBlink = false; // MODIFIED: Flag to control blink
-
       if (tc.settings.forceLastSavedSpeed) {
-        if (eventOrigin === "videoSpeed") {
+        if (event.detail && event.detail.origin === "videoSpeed") {
-          if (event.detail.speed) {
+          video.playbackRate = event.detail.speed;
-            const detailSpeedNum = Number(event.detail.speed);
+          updateSpeedFromEvent(video, event.detail.fromUserInput === true);
-            if (
-              !isNaN(detailSpeedNum) &&
-              Math.abs(video.playbackRate - detailSpeedNum) > 0.001
-            ) {
-              video.playbackRate = detailSpeedNum;
-            }
-          }
-          isFromUserInputForBlink = event.detail.fromUserInput !== false; // Respect passed flag
-          updateSpeedFromEvent(video, isFromUserInputForBlink);
-          event.stopImmediatePropagation();
         } else {
-          if (Math.abs(video.playbackRate - tc.settings.lastSpeed) > 0.001) {
+          video.playbackRate = tc.settings.lastSpeed;
-            log(
-              `Ratechange (Force ON): Discrepancy. Video rate: ${video.playbackRate.toFixed(2)}, VSC wants: ${tc.settings.lastSpeed.toFixed(2)}. Forcing.`,
-              3
-            );
-            video.playbackRate = tc.settings.lastSpeed;
-            event.stopImmediatePropagation();
-            // The next ratechange will be from VSC forcing, consider that not direct user input for blink
-            // updateSpeedFromEvent will be called by that next event.
-          } else {
-            updateSpeedFromEvent(video, false); // Not user input, just confirming forced speed
-          }
         }
+        event.stopImmediatePropagation();
       } else {
-        // forceLastSavedSpeed is OFF
+        updateSpeedFromEvent(video, video.vscIsDirectlySettingRate === true);
-        // Determine if it was a VSC-initiated user action (like S/D keys)
+        if (video.vscIsDirectlySettingRate)
-        // The `setSpeed` function, when called by `runAction`, doesn't add a special origin detail
+          delete video.vscIsDirectlySettingRate;
-        // when forceLastSavedSpeed is off. So, a native ratechange event fires.
-        // We assume if forceLastSavedSpeed is off, any rate change processed here
-        // that isn't a nudge IS significant enough to update UI state.
-        // The "blink" should happen if tc.settings.lastSpeed *changed* due to this event,
-        // implying it wasn't just a confirmation of existing speed.
-        const oldLastSpeed = tc.settings.lastSpeed;
-        updateSpeedFromEvent(video, false); // Initially assume not user-driven for blink
-        if (
-          Math.abs(oldLastSpeed - tc.settings.lastSpeed) > 0.001 &&
-          oldLastSpeed !== 1.0 &&
-          tc.settings.lastSpeed !== 1.0
-        ) {
-          // If lastSpeed actually changed due to this event, it was likely a user action via VSC
-          // or a significant external change. Trigger blink.
-          // Exception: don't blink if going to/from 1.0x as that's often a reset.
-          // This logic is imperfect for determining "user input" when not forcing.
-          // A cleaner way would be if setSpeed could flag the *next* native event.
-          // For now, this is a heuristic.
-          if (!tc.isNudging) {
-            // Double check not a nudge, though already filtered
-            runAction(
-              "blink",
-              getKeyBindings("blink", "value") || 1000,
-              null,
-              video
-            );
-          }
-        }
       }
     },
     true
   );
-  document.vscRateChangeListenerAttached = true; // MODIFIED: Ensure flag is set
+  document.vscRateListenerAttached = true;
 }
 
-// MODIFIED: More robust initialization flow with unique flags
 var vscInitializedDocuments = new Set();
 function initializeWhenReady(doc) {
-  if (doc.vscInitWhenReadyCalledFullUniqueFlag && doc.readyState !== "loading")
+  if (vscInitializedDocuments.has(doc) || !doc.body) return;
-    return;
-  doc.vscInitWhenReadyCalledFullUniqueFlag = true;
-  if (isBlacklisted()) {
-    return;
-  }
-  log(
-    `initializeWhenReady for: ${doc.location ? doc.location.href : "iframe"}. ReadyState: ${doc.readyState}`,
-    5
-  );
-
-  if (doc === window.document && !window.vscPageLoadListenerFullUniqueFlag) {
-    window.addEventListener("load", () => initializeNow(window.document), {
-      once: true
-    });
-    window.vscPageLoadListenerFullUniqueFlag = true;
-  }
   if (doc.readyState === "complete") {
     initializeNow(doc);
   } else {
-    if (!doc.vscReadyStateListenerFullUniqueFlag) {
+    doc.addEventListener("DOMContentLoaded", () => initializeNow(doc), {
-      doc.addEventListener(
+      once: true
-        "readystatechange",
+    });
-        function onRSChange_VSC_Final_Unique_CB() {
-          if (doc.readyState === "complete") {
-            doc.removeEventListener(
-              "readystatechange",
-              onRSChange_VSC_Final_Unique_CB
-            );
-            initializeNow(doc);
-          }
-        }
-      );
-      doc.vscReadyStateListenerFullUniqueFlag = true;
-    }
   }
 }
 function inIframe() {
@@ -719,195 +565,204 @@ function inIframe() {
   }
 }
 function getShadow(parent) {
-  let result = [];
+  let r = [];
-  function getChild(p) {
+  function gC(p) {
     if (p.firstElementChild) {
       var c = p.firstElementChild;
       do {
-        result.push(c);
+        r.push(c);
-        getChild(c);
+        gC(c);
-        if (c.shadowRoot) result.push(...getShadow(c.shadowRoot));
+        if (c.shadowRoot) r.push(...getShadow(c.shadowRoot));
         c = c.nextElementSibling;
       } while (c);
     }
   }
-  getChild(parent);
+  gC(parent);
-  return result;
+  return r;
 }
 
 function initializeNow(doc) {
   if (vscInitializedDocuments.has(doc) || !doc.body) return;
-  log(
+  if (!tc.settings.enabled) return;
-    `initializeNow for doc: ${doc.location ? doc.location.href : "iframe"}`,
-    4
-  );
-  if (!tc.settings.enabled) {
-    log("VSC is disabled.", 4);
-    return;
-  }
   if (!doc.body.classList.contains("vsc-initialized"))
     doc.body.classList.add("vsc-initialized");
   if (typeof tc.videoController === "undefined") defineVideoController();
   setupListener();
-  if (
+
-    inIframe() &&
+  var docs = Array(doc);
-    doc !== window.top.document &&
-    !doc.head.querySelector('link[href*="inject.css"]')
-  ) {
-    var link = doc.createElement("link");
-    link.href = chrome.runtime.getURL("inject.css");
-    link.type = "text/css";
-    link.rel = "stylesheet";
-    doc.head.appendChild(link);
-  }
-  const docsForKeydown = new Set([doc]);
   try {
-    if (inIframe() && window.top.document)
+    if (inIframe()) docs.push(window.top.document);
-      docsForKeydown.add(window.top.document);
   } catch (e) {}
-  docsForKeydown.forEach((lDoc) => {
+  docs.forEach(function (d) {
-    if (!lDoc.vscKeydownListenerUniqueFlagB) {
+    if (d.vscKeydownListenerAttached) return; // Prevent duplicate listeners
-      // Different flag
+    d.addEventListener(
-      lDoc.addEventListener(
+      "keydown",
-        "keydown",
+      function (event) {
-        function (event) {
+        var keyCode = event.keyCode;
-          if (!tc.settings.enabled) return;
+        if (
-          const target = event.target;
+          !event.getModifierState ||
-          if (
+          event.getModifierState("Alt") ||
-            target.nodeName === "INPUT" ||
+          event.getModifierState("Control") ||
-            target.nodeName === "TEXTAREA" ||
+          event.getModifierState("Fn") ||
-            target.isContentEditable
+          event.getModifierState("Meta") ||
-          )
+          event.getModifierState("Hyper") ||
-            return;
+          event.getModifierState("OS")
-          if (
+        )
-            event.getModifierState &&
+          return;
-            (event.getModifierState("Alt") ||
+        if (
-              event.getModifierState("Control") ||
+          event.target.nodeName === "INPUT" ||
-              event.getModifierState("Meta") ||
+          event.target.nodeName === "TEXTAREA" ||
-              event.getModifierState("Fn") ||
+          event.target.isContentEditable
-              event.getModifierState("Hyper") ||
+        )
-              event.getModifierState("OS"))
+          return;
-          )
+        if (!tc.mediaElements.length) return;
-            return;
+        var item = tc.settings.keyBindings.find((item) => item.key === keyCode);
-          if (
+        if (item) {
-            tc.mediaElements.length === 0 &&
+          runAction(item.action, item.value, event);
-            !lDoc.querySelector("video,audio")
+          if (item.force === "true") {
-          )
+            event.preventDefault();
-            return;
+            event.stopPropagation();
-          var item = tc.settings.keyBindings.find(
-            (kb) => kb.key === event.keyCode
-          );
-          if (item) {
-            runAction(item.action, item.value, event);
-            if (item.force === "true" || item.force === true) {
-              event.preventDefault();
-              event.stopPropagation();
-            }
           }
+        }
+        return false;
+      },
+      true
+    );
+    d.vscKeydownListenerAttached = true;
+  });
+
+  if (!doc.vscMutationObserverAttached) {
+    const observer = new MutationObserver(function (mutations) {
+      requestIdleCallback(
+        (_) => {
+          mutations.forEach(function (mutation) {
+            switch (mutation.type) {
+              case "childList":
+                mutation.addedNodes.forEach(function (node) {
+                  if (typeof node === "function") return;
+                  checkForVideo(node, node.parentNode || mutation.target, true);
+                });
+                mutation.removedNodes.forEach(function (node) {
+                  if (typeof node === "function") 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) {
+                    if (node.vsc) node.vsc.remove();
+                    checkForVideo(
+                      node,
+                      node.parentNode || mutation.target,
+                      true
+                    );
+                  }
+                }
+                break;
+            }
+          });
         },
-        true
+        { timeout: 1000 }
       );
-      lDoc.vscKeydownListenerUniqueFlagB = true;
-    }
-  });
-  if (!doc.vscMutationObserverUniqueFlagB) {
-    // Different flag
-    const obs = new MutationObserver((muts) => {
-      if (typeof requestIdleCallback === "function")
-        requestIdleCallback(() => processMutations(muts), { timeout: 1000 });
-      else setTimeout(() => processMutations(muts), 200);
     });
-    function processMutations(mList) {
+    function checkForVideo(node, parent, added) {
-      for (const m of mList) {
+      if (!added && document.body.contains(node)) return;
-        if (m.type === "childList") {
-          m.addedNodes.forEach((n) => {
-            if (n instanceof Element) chkVid(n, n.parentNode || m.target, true);
-          });
-          m.removedNodes.forEach((n) => {
-            if (n instanceof Element)
-              chkVid(n, n.parentNode || m.target, false);
-          });
-        } else if (
-          m.type === "attributes" &&
-          m.attributeName === "aria-hidden" &&
-          m.target instanceof Element &&
-          m.target.getAttribute("aria-hidden") === "false"
-        ) {
-          const vidsInTgt = Array.from(getShadow(m.target)).filter(
-            (el) => el.tagName === "VIDEO"
-          );
-          vidsInTgt.forEach((vEl) => {
-            if (!vEl.vsc) chkVid(vEl, vEl.parentNode || m.target, true);
-          });
-        }
-      }
-    }
-    function chkVid(n, p, add) {
-      if (!add && !n.isConnected) {
-      } else if (!add && n.isConnected) return;
       if (
-        n.nodeName === "VIDEO" ||
+        node.nodeName === "VIDEO" ||
-        (n.nodeName === "AUDIO" && tc.settings.audioBoolean)
+        (node.nodeName === "AUDIO" && tc.settings.audioBoolean)
       ) {
-        if (add) {
+        if (added) {
-          if (!n.vsc) new tc.videoController(n, p);
+          if (!node.vsc) node.vsc = new tc.videoController(node, parent);
         } else {
-          if (n.vsc) n.vsc.remove();
+          if (node.vsc) node.vsc.remove();
+        }
+      } else if (node.children != undefined) {
+        for (var i = 0; i < node.children.length; i++) {
+          const child = node.children[i];
+          checkForVideo(child, child.parentNode || parent, added);
         }
-      } else if (n.children && n.children.length > 0) {
-        for (let i = 0; i < n.children.length; i++)
-          chkVid(n.children[i], n.children[i].parentNode || p, add);
       }
     }
-    obs.observe(doc, {
+    observer.observe(doc, {
+      attributeFilter: ["aria-hidden"],
       childList: true,
-      subtree: true,
+      subtree: true
-      attributes: true,
-      attributeFilter: ["aria-hidden"]
     });
-    doc.vscMutationObserverUniqueFlagB = true;
+    doc.vscMutationObserverAttached = true;
   }
+
   const q = tc.settings.audioBoolean ? "video,audio" : "video";
-  doc.querySelectorAll(q).forEach((vid) => {
+  const foundVideos = doc.querySelectorAll(q);
-    if (!vid.vsc) new tc.videoController(vid, vid.parentElement);
+  foundVideos.forEach((v) => {
+    if (!v.vsc) new tc.videoController(v, v.parentElement);
   });
-  Array.from(doc.getElementsByTagName("iframe")).forEach((fr) => {
+
+  Array.from(doc.getElementsByTagName("iframe")).forEach((f) => {
+    if (f.vscLoadListenerAttached) return;
+    f.addEventListener("load", () => {
+      try {
+        if (f.contentDocument) {
+          initializeWhenReady(f.contentDocument);
+        }
+      } catch (e) {
+        // Silently ignore CORS errors
+      }
+    });
+    f.vscLoadListenerAttached = true;
     try {
-      if (fr.contentDocument) initializeWhenReady(fr.contentDocument);
+      if (f.contentDocument) {
-    } catch (e) {}
+        initializeWhenReady(f.contentDocument);
+      }
+    } catch (e) {
+      // Silently ignore CORS errors
+    }
   });
   vscInitializedDocuments.add(doc);
 }
 
-// MODIFIED setSpeed to accept `isInitialCall` and use it for `fromUserInput`
+function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
-function setSpeed(video, speed, isInitialCall = false) {
   const numericSpeed = Number(speed);
   if (isNaN(numericSpeed) || numericSpeed <= 0 || numericSpeed > 16) return;
   if (!video || !video.vsc || !video.vsc.speedIndicator) return;
+
   log(
-    `setSpeed: Target ${numericSpeed.toFixed(2)}. Initial: ${isInitialCall}`,
+    `setSpeed: Target ${numericSpeed.toFixed(2)}. Initial: ${isInitialCall}. UserKeyPress: ${isUserKeyPress}`,
     4
   );
-
   tc.settings.lastSpeed = numericSpeed;
   video.vsc.speedIndicator.textContent = numericSpeed.toFixed(2);
 
+  if (isUserKeyPress && !isInitialCall && video.vsc && video.vsc.div) {
+    runAction("blink", 1000, null, video); // Pass video to blink
+  }
+
   if (tc.settings.forceLastSavedSpeed) {
     video.dispatchEvent(
       new CustomEvent("ratechange", {
         detail: {
           origin: "videoSpeed",
           speed: numericSpeed.toFixed(2),
-          fromUserInput: !isInitialCall
+          fromUserInput: isUserKeyPress
         }
       })
     );
   } else {
     if (Math.abs(video.playbackRate - numericSpeed) > 0.001) {
-      // Before changing rate, set a flag that this is VSC initiated for non-forced mode
+      if (isUserKeyPress && !isInitialCall) {
-      video.vscIsSettingRate = !isInitialCall; // True if user action, false if initial
+        video.vscIsDirectlySettingRate = true; // Set flag for ratechange listener
+      }
       video.playbackRate = numericSpeed;
-      // Flag will be cleared by ratechange listener after processing
     }
   }
   if (!isInitialCall) refreshCoolDown();
@@ -917,58 +772,35 @@ function setSpeed(video, speed, isInitialCall = false) {
   }
 }
 
-// MODIFIED runAction to pass 4th arg `specificVideo` to some internal calls if needed.
+function runAction(action, value, e) {
-// And pass `isInitialCall=false` to setSpeed calls.
+  log("runAction Begin", 5);
-function runAction(action, value, e, specificVideo = null) {
+  var mediaTagsToProcess;
-  // ... (robust mediaTagsToProcess logic from previous correct version) ...
+  const specificVideo = arguments[3] || null;
-  var mediaTagsToProcess = [];
+
-  if (specificVideo) mediaTagsToProcess = [specificVideo];
+  if (specificVideo) {
-  else if (e && e.target) {
+    mediaTagsToProcess = [specificVideo];
+  } else if (e && e.target && e.target.getRootNode) {
+    // Event-driven action
     const docContext = e.target.ownerDocument || document;
-    let activeVideo = tc.mediaElements.find(
+    mediaTagsToProcess = tc.mediaElements.filter(
-      (v) =>
+      (v) => v.ownerDocument === docContext
-        v.ownerDocument === docContext &&
-        (docContext.activeElement === v || v.contains(docContext.activeElement))
     );
-    if (activeVideo) mediaTagsToProcess = [activeVideo];
+    const targetController = e.target.getRootNode().host;
-    else {
+    if (targetController) {
-      activeVideo = tc.mediaElements.find(
+      // If it's a click on a controller, only use that one video
-        (v) =>
+      const videoFromController = tc.mediaElements.find(
-          v.ownerDocument === docContext &&
+        (v) => v.vsc && v.vsc.div === targetController
-          v.offsetParent !== null &&
-          (!v.paused || v.readyState > 0)
       );
-      if (activeVideo) mediaTagsToProcess = [activeVideo];
+      if (videoFromController) mediaTagsToProcess = [videoFromController];
-      else {
-        mediaTagsToProcess = tc.mediaElements.filter(
-          (v) => v.ownerDocument === docContext
-        );
-        if (mediaTagsToProcess.length === 0 && tc.mediaElements.length > 0)
-          mediaTagsToProcess = [tc.mediaElements[0]];
-        else if (mediaTagsToProcess.length === 0) mediaTagsToProcess = [];
-      }
     }
-  } else mediaTagsToProcess = tc.mediaElements;
+  } else {
+    mediaTagsToProcess = tc.mediaElements;
+  }
   if (mediaTagsToProcess.length === 0 && action !== "display") return;
 
-  var targetControllerFromEvent =
-    e && e.target && e.target.getRootNode && e.target.getRootNode().host
-      ? e.target.getRootNode().host
-      : null;
-  var originalActionForResetContext = actionBeingProcessedForReset_ctx; // Use a local context var
-  actionBeingProcessedForReset_ctx = action;
-
   mediaTagsToProcess.forEach(function (v) {
-    if (!v || !v.vsc || !v.vsc.div || !v.vsc.speedIndicator) return;
+    if (!v.vsc) return; // Don't process videos without a controller
-    var controllerDiv = v.vsc.div;
+    var controller = v.vsc.div;
-    if (
-      targetControllerFromEvent &&
-      targetControllerFromEvent !== controllerDiv &&
-      action !== "blink"
-    )
-      return;
-    if (action === "blink" && specificVideo && v !== specificVideo) return;
-
     const userDrivenActionsThatShowController = [
       "rewind",
       "advance",
@@ -983,16 +815,17 @@ function runAction(action, value, e, specificVideo = null) {
       "drag"
     ];
     if (userDrivenActionsThatShowController.includes(action)) {
-      showController(controllerDiv);
+      showController(controller);
     }
-
     if (v.classList.contains("vsc-cancelled")) return;
     const numValue = parseFloat(value);
     switch (action) {
       case "rewind":
+        isUserSeek = true;
         v.currentTime -= numValue;
         break;
       case "advance":
+        isUserSeek = true;
         v.currentTime += numValue;
         break;
       case "faster":
@@ -1002,43 +835,41 @@ function runAction(action, value, e, specificVideo = null) {
             (v.playbackRate < 0.07 ? 0.07 : v.playbackRate) + numValue,
             16
           ),
-          false
+          false,
+          true
         );
         break;
       case "slower":
-        setSpeed(v, Math.max(v.playbackRate - numValue, 0.07), false);
+        setSpeed(v, Math.max(v.playbackRate - numValue, 0.07), false, true);
         break;
-      // MODIFIED: Calls new resetSpeed directly
       case "reset":
-        resetSpeedSimple(v, 1.0);
+        resetSpeed(v, 1.0, false); // Use enhanced resetSpeed
         break;
       case "fast":
-        resetSpeedSimple(v, numValue);
+        resetSpeed(v, numValue, true); // Use enhanced resetSpeed
         break;
       case "display":
-        controllerDiv.classList.add("vsc-manual");
+        controller.classList.add("vsc-manual");
-        controllerDiv.classList.toggle("vsc-hidden");
+        controller.classList.toggle("vsc-hidden");
         break;
       case "blink":
         if (
-          controllerDiv.classList.contains("vsc-hidden") ||
+          controller.classList.contains("vsc-hidden") ||
-          controllerDiv.blinkTimeOut !== undefined
+          controller.blinkTimeOut !== undefined
         ) {
-          clearTimeout(controllerDiv.blinkTimeOut);
+          clearTimeout(controller.blinkTimeOut);
-          controllerDiv.classList.remove("vsc-hidden");
+          controller.classList.remove("vsc-hidden");
-          controllerDiv.blinkTimeOut = setTimeout(
+          controller.blinkTimeOut = setTimeout(() => {
-            () => {
+            if (
-              if (
+              !(
-                controllerDiv.classList.contains("vsc-manual") &&
+                controller.classList.contains("vsc-manual") &&
-                !controllerDiv.classList.contains("vsc-hidden")
+                !controller.classList.contains("vsc-hidden")
-              ) {
+              )
-              } else {
+            ) {
-                controllerDiv.classList.add("vsc-hidden");
+              controller.classList.add("vsc-hidden");
-              }
+            }
-              controllerDiv.blinkTimeOut = undefined;
+            controller.blinkTimeOut = undefined;
-            },
+          }, numValue || 1000); // FIXED: Use numValue for consistency
-            typeof value === "number" && !isNaN(value) ? value : 1000
-          );
         }
         break;
       case "drag":
@@ -1056,113 +887,99 @@ function runAction(action, value, e, specificVideo = null) {
       case "jump":
         jumpToMark(v);
         break;
-      default:
-        log(`Unknown action: ${action}`, 3);
     }
   });
-  actionBeingProcessedForReset_ctx = originalActionForResetContext;
+  log("runAction End", 5);
 }
-var actionBeingProcessedForReset_ctx = null; // Context for original resetSpeed
 
 function pause(v) {
   if (v.paused) v.play().catch((e) => log(`Play err:${e.message}`, 2));
   else v.pause();
 }
 
-// MODIFIED: New simpler resetSpeed function
+function resetSpeed(v, target, isFastKey = false) {
-function resetSpeedSimple(v, targetActionSpeed) {
+  const videoId = v.currentSrc || v.src || "default";
-  log(
+  const currentSpeed = v.playbackRate;
-    `resetSpeedSimple: Video current: ${v.playbackRate.toFixed(2)}, Target for this action: ${targetActionSpeed.toFixed(2)}`,
-    4
-  );
-  const fastPreferredSpeed = getKeyBindings("fast", "value") || 1.8;
 
-  if (targetActionSpeed === 1.0) {
+  if (isFastKey) {
-    // Action was "reset" (R key)
+    // G key: Toggle between current speed and preferred speed (e.g., 1.8)
-    if (Math.abs(v.playbackRate - 1.0) < 0.01) {
+    const preferredSpeed = target;
-      setSpeed(v, fastPreferredSpeed, false);
+    const lastToggle = lastToggleSpeed[videoId] || currentSpeed;
+
+    if (Math.abs(currentSpeed - preferredSpeed) < 0.01) {
+      // Currently at preferred speed, toggle to the last speed
+      setSpeed(v, lastToggle, false, true);
     } else {
-      setSpeed(v, 1.0, false);
+      // Not at preferred speed, save current as toggle speed and go to preferred
+      lastToggleSpeed[videoId] = currentSpeed;
+      setSpeed(v, preferredSpeed, false, true);
     }
   } else {
-    // Action was "fast" (G key), targetActionSpeed is the preferred speed
+    // R key: Toggle between current speed and 1.0
-    if (Math.abs(v.playbackRate - targetActionSpeed) < 0.01) {
+    const resetSpeedValue = 1.0;
-      setSpeed(v, 1.0, false);
+    const lastToggle = lastToggleSpeed[videoId] || currentSpeed;
+
+    if (Math.abs(currentSpeed - resetSpeedValue) < 0.01) {
+      // Currently at 1.0, toggle to the last speed (or 1.8 if no history)
+      const speedToRestore =
+        Math.abs(lastToggle - 1.0) < 0.01
+          ? getKeyBindings("fast") || 1.8
+          : lastToggle;
+      setSpeed(v, speedToRestore, false, true);
     } else {
-      setSpeed(v, targetActionSpeed, false);
+      // Not at 1.0, save current as toggle speed and go to 1.0
+      lastToggleSpeed[videoId] = currentSpeed;
+      setSpeed(v, resetSpeedValue, false, true);
     }
   }
 }
-// Remove or comment out the old `resetSpeed` function that uses setKeyBindings and actionBeingProcessedForReset_global
-/*
-function resetSpeed(v, target) { // THIS IS THE OLD ONE TO BE REPLACED by resetSpeedSimple
-  // ... original complex logic ...
-}
-*/
 
 function muted(v) {
   v.muted = !v.muted;
-  log(`Mute: ${v.muted}`, 5);
 }
 function setMark(v) {
-  if (!v.vsc) v.vsc = {};
   v.vsc.mark = v.currentTime;
-  log(`Mark: ${v.vsc.mark.toFixed(2)}`, 5);
 }
 function jumpToMark(v) {
   if (v.vsc && typeof v.vsc.mark === "number") v.currentTime = v.vsc.mark;
-  else log("No mark.", 4);
 }
 function handleDrag(video, e) {
-  /* ... same original ... */
+  const c = video.vsc.div;
-  if (!video || !video.vsc || !video.vsc.div || !video.vsc.div.shadowRoot)
+  const sC = c.shadowRoot.querySelector("#controller");
-    return;
+  var pE = c.parentElement;
-  const controller = video.vsc.div;
-  const shadowController = controller.shadowRoot.querySelector("#controller");
-  if (!shadowController) return;
-  var parentElement = controller.parentElement;
   while (
-    parentElement &&
+    pE.parentNode &&
-    parentElement.parentNode &&
+    pE.parentNode.offsetHeight === pE.offsetHeight &&
-    parentElement.parentNode !== document &&
+    pE.parentNode.offsetWidth === pE.offsetWidth
-    parentElement.parentNode.offsetHeight === parentElement.offsetHeight &&
-    parentElement.parentNode.offsetWidth === parentElement.offsetWidth
   )
-    parentElement = parentElement.parentNode;
+    pE = pE.parentNode;
-  const dragBoundary = parentElement || video.ownerDocument.body;
   video.classList.add("vcs-dragging");
-  shadowController.classList.add("dragging");
+  sC.classList.add("dragging");
   const iXY = [e.clientX, e.clientY],
-    iCtrlXY = [
+    iCXY = [parseInt(sC.style.left), parseInt(sC.style.top)];
-      parseInt(shadowController.style.left, 10) || 0,
+  const sD = (e) => {
-      parseInt(shadowController.style.top, 10) || 0
+    let s = sC.style;
-    ];
+    s.left = iCXY[0] + e.clientX - iXY[0] + "px";
-  const sD = (mvE) => {
+    s.top = iCXY[1] + e.clientY - iXY[1] + "px";
-    let s = shadowController.style;
-    s.left = iCtrlXY[0] + mvE.clientX - iXY[0] + "px";
-    s.top = iCtrlXY[1] + mvE.clientY - iXY[1] + "px";
-    mvE.preventDefault();
   };
   const eD = () => {
-    dragBoundary.removeEventListener("mousemove", sD);
+    pE.removeEventListener("mousemove", sD);
-    dragBoundary.removeEventListener("mouseup", eD);
+    pE.removeEventListener("mouseup", eD);
-    dragBoundary.removeEventListener("mouseleave", eD);
+    pE.removeEventListener("mouseleave", eD);
-    shadowController.classList.remove("dragging");
+    sC.classList.remove("dragging");
     video.classList.remove("vcs-dragging");
   };
-  dragBoundary.addEventListener("mousemove", sD);
+  pE.addEventListener("mouseup", eD);
-  dragBoundary.addEventListener("mouseup", eD);
+  pE.addEventListener("mouseleave", eD);
-  dragBoundary.addEventListener("mouseleave", eD);
+  pE.addEventListener("mousemove", sD);
 }
 var timer = null;
 function showController(controller) {
-  /* ... same original ... */
   if (!controller || typeof controller.classList === "undefined") return;
-  controller.classList.add("vcs-show");
+  controller.classList.add("vsc-show");
   if (timer) clearTimeout(timer);
   timer = setTimeout(function () {
-    if (controller && controller.classList)
+    controller.classList.remove("vsc-show");
-      controller.classList.remove("vsc-show");
     timer = false;
   }, 2000);
 }

manifest.json

@@ -1,13 +1,13 @@
 {
   "name": "Video Speed Controller",
   "short_name": "videospeed",
-  "version": "0.6.3.3",
+  "version": "1.4.5",
   "manifest_version": 2,
   "description": "Speed up, slow down, advance and rewind HTML5 audio/video with shortcuts",
-  "homepage_url": "https://github.com/codebicycle/videospeed",
+  "homepage_url": "https://github.com/SoPat712/videospeed",
   "browser_specific_settings": {
     "gecko": {
-      "id": "{7be2ba16-0f1e-4d93-9ebc-5164397477a9}"
+      "id": "{ed860648-f54f-4dc9-9a0d-501aec4313f5}"
     }
   },
   "icons": {

options.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>Video Speed Controller: Options</title>
@@ -148,8 +148,13 @@
         <input id="rememberSpeed" type="checkbox" />
       </div>
       <div class="row">
-        <label for="forceLastSavedSpeed">Force last saved speed<br />
+        <label for="forceLastSavedSpeed"
-        <em>Useful for video players that override the speeds set by VideoSpeed</em></label>
+          >Force last saved speed<br />
+          <em
+            >Useful for video players that override the speeds set by
+            VideoSpeed</em
+          ></label
+        >
         <input id="forceLastSavedSpeed" type="checkbox" />
       </div>
       <div class="row">
@@ -175,6 +180,47 @@
       </div>
     </section>
 
+    <section id="nudgeSettings">
+      <h3>Subtitle Nudge Settings (Experimental - YouTube Only)</h3>
+      <div class="row">
+        <label for="enableSubtitleNudge"
+          >Enable Subtitle Nudge <br /><em
+            >Periodically 'nudges' video speed by a tiny amount to help keep
+            subtitles in sync on some sites (e.g. YouTube).</em
+          >
+        </label>
+        <input id="enableSubtitleNudge" type="checkbox" />
+      </div>
+      <div class="row">
+        <label for="subtitleNudgeInterval"
+          >Nudge Interval (milliseconds) <br /><em
+            >How often to nudge (e.g., 25-1000). Smaller values are more
+            frequent. Default: 25.</em
+          >
+        </label>
+        <input
+          id="subtitleNudgeInterval"
+          type="text"
+          value=""
+          placeholder="25"
+        />
+      </div>
+      <div class="row">
+        <label for="subtitleNudgeAmount"
+          >Nudge Amount (decimal) <br /><em
+            >How much to change speed by (e.g., 0.001). Very small values
+            recommended. Default: 0.001.</em
+          >
+        </label>
+        <input
+          id="subtitleNudgeAmount"
+          type="text"
+          value=""
+          placeholder="0.001"
+        />
+      </div>
+    </section>
+
     <button id="save">Save</button>
     <button id="restore">Restore Defaults</button>
     <button id="experimental">Show Experimental Features</button>
@@ -186,12 +232,12 @@
 
       <h4>Extension controls not appearing?</h4>
       <p>
-        This extension is only compatible with HTML5 audio and video. If you don't
+        This extension is only compatible with HTML5 audio and video. If you
-        see the controls showing up, chances are you are viewing a Flash content.
+        don't see the controls showing up, chances are you are viewing a Flash
-        If you want to confirm, try right-clicking on the content and inspect the
+        content. If you want to confirm, try right-clicking on the content and
-        menu: if it mentions flash, then that's the issue. That said, <b>most sites
+        inspect the menu: if it mentions flash, then that's the issue. That
-        will fallback to HTML5</b> if they detect that Flash is not available. You
+        said, <b>most sites will fallback to HTML5</b> if they detect that Flash
-        can try manually disabling Flash from the browser.
+        is not available. You can try manually disabling Flash from the browser.
       </p>
     </div>
   </body>

options.js

@@ -22,13 +22,17 @@ var tcDefaults = {
     twitter.com
     imgur.com
     teams.microsoft.com
-  `.replace(regStrip, "")
+  `.replace(regStrip, ""),
+  // ADDED: Nudge defaults
+  enableSubtitleNudge: true,
+  subtitleNudgeInterval: 25,
+  subtitleNudgeAmount: 0.001
 };
 
-var keyBindings = [];
+var keyBindings = []; // This is populated during save/restore
 
 var keyCodeAliases = {
-  0: "null",
+  /* ... same as your original ... */ 0: "null",
   null: "null",
   undefined: "null",
   32: "Space",
@@ -74,85 +78,55 @@ var keyCodeAliases = {
   220: "\\",
   221: "]",
   222: "'",
-  59:  ";",
+  59: ";",
-  61:  "+",
+  61: "+",
-  173: "-",
+  173: "-"
 };
 
 function recordKeyPress(e) {
+  /* ... same as your original ... */
   if (
-    (e.keyCode >= 48 && e.keyCode <= 57) || // Numbers 0-9
+    (e.keyCode >= 48 && e.keyCode <= 57) ||
-    (e.keyCode >= 65 && e.keyCode <= 90) || // Letters A-Z
+    (e.keyCode >= 65 && e.keyCode <= 90) ||
-    keyCodeAliases[e.keyCode] // Other character keys
+    keyCodeAliases[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
     e.target.value = "";
   } else if (e.keyCode === 27) {
-    // When esc clicked, clear input
     e.target.value = "null";
     e.target.keyCode = null;
   }
 }
-
 function inputFilterNumbersOnly(e) {
+  /* ... same as your original ... */
   var char = String.fromCharCode(e.keyCode);
   if (!/[\d\.]$/.test(char) || !/^\d+(\.\d*)?$/.test(e.target.value + char)) {
     e.preventDefault();
     e.stopPropagation();
   }
 }
-
 function inputFocus(e) {
-  e.target.value = "";
+  /* ... same as your original ... */ e.target.value = "";
 }
-
 function inputBlur(e) {
-  e.target.value =
+  /* ... same as your original ... */ e.target.value =
     keyCodeAliases[e.target.keyCode] || String.fromCharCode(e.target.keyCode);
 }
-
+// function updateShortcutInputText(inputId, keyCode) { /* ... same as your original ... */ } // Not directly used in provided options.js logic flow
-function updateShortcutInputText(inputId, keyCode) {
-  document.getElementById(inputId).value =
-    keyCodeAliases[keyCode] || String.fromCharCode(keyCode);
-  document.getElementById(inputId).keyCode = keyCode;
-}
-
 function updateCustomShortcutInputText(inputItem, keyCode) {
-  inputItem.value = keyCodeAliases[keyCode] || String.fromCharCode(keyCode);
+  /* ... same as your original ... */ inputItem.value =
+    keyCodeAliases[keyCode] || String.fromCharCode(keyCode);
   inputItem.keyCode = keyCode;
 }
-
+var customActionsNoValues = ["pause", "muted", "mark", "jump", "display"]; // Original
-// List of custom actions for which customValue should be disabled
-var customActionsNoValues = ["pause", "muted", "mark", "jump", "display"];
-
 function add_shortcut() {
-  var html = `<select class="customDo">
+  /* ... same as your original ... */
-    <option value="slower">Decrease speed</option>
+  var html = `<select class="customDo"><option value="slower">Decrease speed</option><option value="faster">Increase speed</option><option value="rewind">Rewind</option><option value="advance">Advance</option><option value="reset">Reset speed</option><option value="fast">Preferred speed</option><option value="muted">Mute</option><option value="pause">Pause</option><option value="mark">Set marker</option><option value="jump">Jump to marker</option><option value="display">Show/hide controller</option></select><input class="customKey" type="text" 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 website key bindings</option></select><button class="removeParent">X</button>`;
-    <option value="faster">Increase speed</option>
-    <option value="rewind">Rewind</option>
-    <option value="advance">Advance</option>
-    <option value="reset">Reset speed</option>
-    <option value="fast">Preferred speed</option>
-    <option value="muted">Mute</option>
-    <option value="pause">Pause</option>
-    <option value="mark">Set marker</option>
-    <option value="jump">Jump to marker</option>
-    <option value="display">Show/hide controller</option>
-    </select>
-    <input class="customKey" type="text" 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 website key bindings</option>
-    </select>
-    <button class="removeParent">X</button>`;
   var div = document.createElement("div");
   div.setAttribute("class", "row customs");
   div.innerHTML = html;
@@ -162,14 +136,13 @@ function add_shortcut() {
     customs_element.children[customs_element.childElementCount - 1]
   );
 }
-
 function createKeyBindings(item) {
+  /* ... same as your original ... */
   const action = item.querySelector(".customDo").value;
   const key = item.querySelector(".customKey").keyCode;
   const value = Number(item.querySelector(".customValue").value);
   const force = item.querySelector(".customForce").value;
-  const predefined = !!item.id; //item.id ? true : false;
+  const predefined = !!item.id;
-
   keyBindings.push({
     action: action,
     key: key,
@@ -178,9 +151,8 @@ function createKeyBindings(item) {
     predefined: predefined
   });
 }
-
-// Validates settings before saving
 function validate() {
+  /* ... same as your original ... */
   var valid = true;
   var status = document.getElementById("status");
   document
@@ -190,7 +162,7 @@ function validate() {
       match = match.replace(regStrip, "");
       if (match.startsWith("/")) {
         try {
-          var regexp = new RegExp(match);
+          new RegExp(match);
         } catch (err) {
           status.textContent =
             "Error: Invalid blacklist regex: " + match + ". Unable to save";
@@ -202,24 +174,45 @@ function validate() {
   return valid;
 }
 
-// Saves options to chrome.storage
+// MODIFIED: save_options to include nudge settings
 function save_options() {
-  if (validate() === false) {
+  if (validate() === false) return;
-    return;
+
-  }
+  keyBindings = []; // Reset global keyBindings before populating from DOM
-  keyBindings = [];
   Array.from(document.querySelectorAll(".customs")).forEach((item) =>
     createKeyBindings(item)
-  ); // Remove added shortcuts
+  );
 
-  var rememberSpeed = document.getElementById("rememberSpeed").checked;
+  var s = {}; // Object to hold all settings to be saved
-  var forceLastSavedSpeed = document.getElementById("forceLastSavedSpeed").checked;
+  s.rememberSpeed = document.getElementById("rememberSpeed").checked;
-  var audioBoolean = document.getElementById("audioBoolean").checked;
+  s.forceLastSavedSpeed = document.getElementById(
-  var enabled = document.getElementById("enabled").checked;
+    "forceLastSavedSpeed"
-  var startHidden = document.getElementById("startHidden").checked;
+  ).checked;
-  var controllerOpacity = document.getElementById("controllerOpacity").value;
+  s.audioBoolean = document.getElementById("audioBoolean").checked;
-  var blacklist = document.getElementById("blacklist").value;
+  s.enabled = document.getElementById("enabled").checked;
+  s.startHidden = document.getElementById("startHidden").checked;
+  s.controllerOpacity = document.getElementById("controllerOpacity").value;
+  s.blacklist = document
+    .getElementById("blacklist")
+    .value.replace(regStrip, "");
+  s.keyBindings = keyBindings; // Use the populated global keyBindings
 
+  // ADDED: Save nudge settings
+  s.enableSubtitleNudge = document.getElementById(
+    "enableSubtitleNudge"
+  ).checked;
+  s.subtitleNudgeInterval =
+    parseInt(document.getElementById("subtitleNudgeInterval").value, 10) ||
+    tcDefaults.subtitleNudgeInterval;
+  s.subtitleNudgeAmount =
+    parseFloat(document.getElementById("subtitleNudgeAmount").value) ||
+    tcDefaults.subtitleNudgeAmount;
+  // Basic validation for nudge interval and amount
+  if (s.subtitleNudgeInterval < 10) s.subtitleNudgeInterval = 10; // Min 10ms
+  if (s.subtitleNudgeAmount <= 0 || s.subtitleNudgeAmount > 0.1)
+    s.subtitleNudgeAmount = tcDefaults.subtitleNudgeAmount;
+
+  // Remove old flat settings (original logic)
   chrome.storage.sync.remove([
     "resetSpeed",
     "speedStep",
@@ -233,33 +226,22 @@ function save_options() {
     "advanceKeyCode",
     "fastKeyCode"
   ]);
-  chrome.storage.sync.set(
+
-    {
+  chrome.storage.sync.set(s, function () {
-      rememberSpeed: rememberSpeed,
+    var status = document.getElementById("status");
-      forceLastSavedSpeed: forceLastSavedSpeed,
+    status.textContent = "Options saved";
-      audioBoolean: audioBoolean,
+    setTimeout(function () {
-      enabled: enabled,
+      status.textContent = "";
-      startHidden: startHidden,
+    }, 1000);
-      controllerOpacity: controllerOpacity,
+  });
-      keyBindings: keyBindings,
-      blacklist: blacklist.replace(regStrip, "")
-    },
-    function () {
-      // Update status to let user know options were saved.
-      var status = document.getElementById("status");
-      status.textContent = "Options saved";
-      setTimeout(function () {
-        status.textContent = "";
-      }, 1000);
-    }
-  );
 }
 
-// Restores options from chrome.storage
+// MODIFIED: restore_options to include nudge settings
 function restore_options() {
   chrome.storage.sync.get(tcDefaults, function (storage) {
     document.getElementById("rememberSpeed").checked = storage.rememberSpeed;
-    document.getElementById("forceLastSavedSpeed").checked = storage.forceLastSavedSpeed;
+    document.getElementById("forceLastSavedSpeed").checked =
+      storage.forceLastSavedSpeed;
     document.getElementById("audioBoolean").checked = storage.audioBoolean;
     document.getElementById("enabled").checked = storage.enabled;
     document.getElementById("startHidden").checked = storage.startHidden;
@@ -267,65 +249,86 @@ function restore_options() {
       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
+    // ADDED: Restore nudge settings
+    document.getElementById("enableSubtitleNudge").checked =
+      storage.enableSubtitleNudge;
+    document.getElementById("subtitleNudgeInterval").value =
+      storage.subtitleNudgeInterval;
+    document.getElementById("subtitleNudgeAmount").value =
+      storage.subtitleNudgeAmount;
+
+    // Original key binding restoration logic
+    if (
+      !Array.isArray(storage.keyBindings) ||
+      storage.keyBindings.length === 0
+    ) {
+      // If keyBindings missing or not an array, use defaults from tcDefaults
+      storage.keyBindings = tcDefaults.keyBindings;
+    }
     if (storage.keyBindings.filter((x) => x.action == "display").length == 0) {
       storage.keyBindings.push({
         action: "display",
         value: 0,
         force: false,
-        predefined: true
+        predefined: true,
+        key: storage.displayKeyCode || tcDefaults.displayKeyCode
       });
     }
 
+    // Clear existing dynamic shortcuts before restoring (if any were added by mistake)
+    const dynamicShortcuts = document.querySelectorAll(".customs:not([id])");
+    dynamicShortcuts.forEach((sc) => sc.remove());
+
     for (let i in storage.keyBindings) {
       var item = storage.keyBindings[i];
       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") {
-          item["key"] = storage.displayKeyCode || tcDefaults.displayKeyCode; // V
+          item["key"] = storage.displayKeyCode || tcDefaults.displayKeyCode;
         }
-
+        if (customActionsNoValues.includes(item["action"])) {
-        if (customActionsNoValues.includes(item["action"]))
+          const el = document.querySelector(
-          document.querySelector(
             "#" + item["action"] + " .customValue"
-          ).disabled = true;
+          );
-
+          if (el) el.disabled = true;
-        updateCustomShortcutInputText(
+        }
-          document.querySelector("#" + item["action"] + " .customKey"),
+        const keyEl = document.querySelector(
-          item["key"]
+          "#" + item["action"] + " .customKey"
         );
-        document.querySelector("#" + item["action"] + " .customValue").value =
+        const valEl = document.querySelector(
-          item["value"];
+          "#" + item["action"] + " .customValue"
-        document.querySelector("#" + item["action"] + " .customForce").value =
+        );
-          item["force"];
+        const forceEl = document.querySelector(
+          "#" + item["action"] + " .customForce"
+        );
+        if (keyEl) updateCustomShortcutInputText(keyEl, item["key"]);
+        if (valEl) valEl.value = item["value"];
+        if (forceEl) forceEl.value = String(item["force"]); // Ensure string for select value
       } else {
-        // new ones
+        // Non-predefined, dynamically added shortcuts
         add_shortcut();
-        const dom = document.querySelector(".customs:last-of-type");
+        const dom = document.querySelector(".customs:last-of-type"); // Gets the newly added one
         dom.querySelector(".customDo").value = item["action"];
-
+        if (customActionsNoValues.includes(item["action"])) {
-        if (customActionsNoValues.includes(item["action"]))
           dom.querySelector(".customValue").disabled = true;
-
+        }
         updateCustomShortcutInputText(
           dom.querySelector(".customKey"),
           item["key"]
         );
         dom.querySelector(".customValue").value = item["value"];
-        dom.querySelector(".customForce").value = item["force"];
+        dom.querySelector(".customForce").value = String(item["force"]);
       }
     }
   });
 }
 
 function restore_defaults() {
+  /* ... same as your original, tcDefaults now includes nudge defaults ... */
+  // Remove all dynamically added shortcuts first
+  document.querySelectorAll(".customs:not([id])").forEach((el) => el.remove());
+  // Then set defaults and restore options, which will re-add predefined ones correctly
   chrome.storage.sync.set(tcDefaults, function () {
-    restore_options();
+    restore_options(); // This will populate based on tcDefaults
-    document
-      .querySelectorAll(".removeParent")
-      .forEach((button) => button.click()); // Remove added shortcuts
-    // Update status to let user know options were saved.
     var status = document.getElementById("status");
     status.textContent = "Default options restored";
     setTimeout(function () {
@@ -335,14 +338,15 @@ function restore_defaults() {
 }
 
 function show_experimental() {
+  /* ... same as your original ... */
   document
     .querySelectorAll(".customForce")
     .forEach((item) => (item.style.display = "inline-block"));
 }
 
 document.addEventListener("DOMContentLoaded", function () {
+  /* ... same as your original event listeners setup ... */
   restore_options();
-
   document.getElementById("save").addEventListener("click", save_options);
   document.getElementById("add").addEventListener("click", add_shortcut);
   document
@@ -353,34 +357,32 @@ document.addEventListener("DOMContentLoaded", function () {
     .addEventListener("click", show_experimental);
 
   function eventCaller(event, className, funcName) {
-    if (!event.target.classList || !event.target.classList.contains(className)) {
+    if (!event.target.classList || !event.target.classList.contains(className))
       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();
-    });
+    })
-  });
+  );
   document.addEventListener("change", (event) => {
     eventCaller(event, "customDo", function () {
       if (customActionsNoValues.includes(event.target.value)) {
         event.target.nextElementSibling.nextElementSibling.disabled = true;
-        event.target.nextElementSibling.nextElementSibling.value = 0;
+        event.target.nextElementSibling.nextElementSibling.value = 0; // Or "" if placeholder is preferred
       } else {
         event.target.nextElementSibling.nextElementSibling.disabled = false;
       }