Release v5.2.4

inject.js

@@ -969,8 +969,8 @@ function ensureController(node, parent) {
   }
 
   // href selects site rules; re-run on every new/usable media so margins/opacity match current URL.
-  applySiteRuleOverrides();
+  var siteDisabled = applySiteRuleOverrides();
-  if (!siteRuleUtils.isSpeederActiveForSite(tc.settings.enabled, tc.activeSiteRule)) {
+  if (!tc.settings.enabled || siteDisabled) {
     return null;
   }
   refreshAllControllerGeometry();
@@ -2016,7 +2016,6 @@ function defineVideoController() {
 
 function applySiteRuleOverrides() {
   resetSettingsFromSiteRuleBase();
-  tc.activeSiteRule = null;
 
   if (!Array.isArray(tc.settings.siteRules) || tc.settings.siteRules.length === 0) {
     return false;
@@ -2025,9 +2024,7 @@ function applySiteRuleOverrides() {
   var currentUrl = location.href;
   var matchedRule = siteRuleUtils.matchSiteRule(currentUrl, tc.settings.siteRules);
 
-  if (!matchedRule) {
+  if (!matchedRule) return false;
-    return false;
-  }
 
   tc.activeSiteRule = matchedRule;
   log(`Matched site rule: ${matchedRule.pattern}`, 4);
@@ -2107,10 +2104,8 @@ function refreshAllControllerGeometry() {
 
 /** Re-match site rules for current URL and refresh controller position/opacity on every video. */
 function reapplySiteRulesAndControllerGeometry() {
-  applySiteRuleOverrides();
+  var siteDisabled = applySiteRuleOverrides();
-  if (!siteRuleUtils.isSpeederActiveForSite(tc.settings.enabled, tc.activeSiteRule)) {
+  if (!tc.settings.enabled || siteDisabled) return;
-    return;
-  }
   refreshAllControllerGeometry();
 }
 
@@ -2458,10 +2453,8 @@ function attachNavigationListeners() {
 function initializeNow(doc, forceReinit = false) {
   if ((!forceReinit && vscInitializedDocuments.has(doc)) || !doc.body) return;
 
-  applySiteRuleOverrides();
+  var siteDisabled = applySiteRuleOverrides();
-  if (!siteRuleUtils.isSpeederActiveForSite(tc.settings.enabled, tc.activeSiteRule)) {
+  if (!tc.settings.enabled || siteDisabled) return;
-    return;
-  }
 
   if (!doc.body.classList.contains("vsc-initialized")) {
     doc.body.classList.add("vsc-initialized");

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Speeder",
   "short_name": "Speeder",
-  "version": "5.2.5.0",
+  "version": "5.2.4",
   "manifest_version": 2,
   "description": "Speed up, slow down, advance and rewind HTML5 audio/video with shortcuts (New and improved version of \"Video Speed Controller\")",
   "homepage_url": "https://github.com/SoPat712/speeder",

options.css

@@ -348,27 +348,6 @@ label em {
   text-align: center;
 }
 
-/* Chevron: native menu indicator is often missing with themed controls */
-#addShortcutSelector,
-.site-add-shortcut-selector {
-  appearance: none;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  background-color: var(--panel);
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 24 24' fill='none' stroke='%234b5563' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m6 9 6 6 6-6'/%3E%3C/svg%3E");
-  background-repeat: no-repeat;
-  background-position: right 12px center;
-  background-size: 16px 16px;
-  padding-right: 38px;
-  cursor: pointer;
-}
-
-#addShortcutSelector:disabled,
-.site-add-shortcut-selector:disabled {
-  cursor: not-allowed;
-  opacity: 0.72;
-}
-
 #addShortcutSelector {
   width: min(220px, 100%);
   margin-top: 12px;
@@ -510,7 +489,7 @@ label em {
   display: grid;
   grid-template-columns: minmax(0, 1fr) auto;
   gap: 16px;
-  align-items: start;
+  align-items: center;
   font-weight: 600;
   margin-bottom: 8px;
   cursor: pointer;
@@ -523,11 +502,6 @@ label em {
 
 .site-override-lead span {
   margin: 0;
-  font-weight: 600;
-}
-
-.site-override-lead span em {
-  font-weight: 400;
 }
 
 .site-rule-override-section .site-override-fields,
@@ -961,10 +935,6 @@ button.lucide-result-tile.lucide-picked {
   color: var(--text);
 }
 
-.site-rule-split-label span em {
-  font-weight: 400;
-}
-
 .site-rule-split-label input[type="checkbox"] {
   justify-self: end;
   margin-top: 0;
@@ -999,22 +969,16 @@ button.lucide-result-tile.lucide-picked {
 }
 
 .site-shortcuts-container .shortcut-row {
-  grid-template-columns: minmax(0, 1fr) 110px 110px minmax(0, 1fr) 38px;
+  grid-template-columns: minmax(0, 1fr) 110px 110px minmax(0, 1fr);
   padding: 8px 0;
   border-top: 1px solid var(--border);
 }
 
-.site-shortcuts-rows .shortcut-row:first-child {
+.site-shortcuts-container .shortcut-row:first-child {
   padding-top: 0;
   border-top: 0;
 }
 
-.site-add-shortcut-selector {
-  width: min(220px, 100%);
-  align-self: flex-start;
-  margin-top: 0;
-}
-
 .force-label {
   display: flex;
   align-items: center;
@@ -1156,8 +1120,7 @@ button.lucide-result-tile.lucide-picked {
   }
 
   .action-row button,
-  #addShortcutSelector,
+  #addShortcutSelector {
-  .site-add-shortcut-selector {
     width: 100%;
   }
 
@@ -1241,12 +1204,6 @@ button.lucide-result-tile.lucide-picked {
     background: rgba(255, 255, 255, 0.04);
   }
 
-  #addShortcutSelector,
-  .site-add-shortcut-selector {
-    background-color: var(--panel);
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 24 24' fill='none' stroke='%239ca3af' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m6 9 6 6 6-6'/%3E%3C/svg%3E");
-  }
-
   input[type="text"]:focus,
   select:focus,
   textarea:focus {

options.html

@@ -253,22 +253,11 @@
           <h4 class="defaults-sub-heading">General</h4>
 
           <div class="row row-checkbox">
-            <label for="enabled"
+            <label for="enabled">Enable</label>
-              >Enable<br />
-              <em
-                >On: site rules can block sites (blacklist). Off: only matched rules keep Speeder on (whitelist).</em
-              >
-            </label>
             <input id="enabled" type="checkbox" />
           </div>
           <div class="row row-checkbox">
-            <label for="audioBoolean"
+            <label for="audioBoolean">Work on audio</label>
-              >Work on audio<br />
-              <em
-                >Also controls plain HTML5 audio (not just video). Turn off if
-                you only want Speeder on video players.</em
-              >
-            </label>
             <input id="audioBoolean" type="checkbox" />
           </div>
 
@@ -276,14 +265,7 @@
           <h4 class="defaults-sub-heading">Playback</h4>
 
           <div class="row row-checkbox">
-            <label for="rememberSpeed"
+            <label for="rememberSpeed">Remember playback speed</label>
-              >Remember playback speed<br />
-              <em
-                >Stores speed per source so revisiting the same media can restore
-                it. Separate from &ldquo;Force last saved speed,&rdquo; which
-                fights players that reset rate.</em
-              >
-            </label>
             <input id="rememberSpeed" type="checkbox" />
           </div>
           <div class="row row-checkbox">
@@ -301,23 +283,11 @@
           <h4 class="defaults-sub-heading">Controller</h4>
 
           <div class="row row-checkbox">
-            <label for="startHidden"
+            <label for="startHidden">Hide controller by default</label>
-              >Hide controller by default<br />
-              <em
-                >Starts with the overlay hidden; use shortcuts (show/hide,
-                move) or site behavior to reveal it.</em
-              >
-            </label>
             <input id="startHidden" type="checkbox" />
           </div>
           <div class="row">
-            <label for="controllerLocation"
+            <label for="controllerLocation">Default controller location</label>
-              >Default controller location<br />
-              <em
-                >Corner or edge anchor for the hover bar. Site rules can override
-                this for specific URLs.</em
-              >
-            </label>
             <select id="controllerLocation">
               <option value="top-left">Top left</option>
               <option value="top-center">Top center</option>
@@ -330,13 +300,7 @@
             </select>
           </div>
           <div class="row">
-            <label for="controllerOpacity"
+            <label for="controllerOpacity">Controller opacity</label>
-              >Controller opacity<br />
-              <em
-                >0&ndash;1 (decimals). Lower is more transparent. Applies to the
-                in-page controller only.</em
-              >
-            </label>
             <input id="controllerOpacity" type="text" value="" />
           </div>
           <div class="row row-controller-margin">
@@ -452,23 +416,11 @@
                 </p>
               </div>
               <div class="row row-checkbox">
-                <label for="showPopupControlBar"
+                <label for="showPopupControlBar">Show popup control bar</label>
-                  >Show popup control bar<br />
-                  <em
-                    >Shows buttons in the extension popup (toolbar icon). Can be
-                    overridden per site in site rules.</em
-                  >
-                </label>
                 <input id="showPopupControlBar" type="checkbox" />
               </div>
               <div class="row row-checkbox">
-                <label for="popupMatchHoverControls"
+                <label for="popupMatchHoverControls">Match hover controls</label>
-                  >Match hover controls<br />
-                  <em
-                    >When on, the popup copies the hover bar&rsquo;s buttons and
-                    order. When off, customize the popup layout below.</em
-                  >
-                </label>
                 <input id="popupMatchHoverControls" type="checkbox" />
               </div>
               <div id="popupCbEditorWrap" class="cb-editor cb-editor-disabled">
@@ -616,36 +568,19 @@
             <div class="site-rule-body">
               <div class="site-rule-option site-rule-option-checkbox">
                 <label class="site-rule-split-label">
-                  <span
+                  <span>Enable Speeder on this site</span>
-                    >Enable Speeder on this site<br /><em
-                      >For this URL pattern only: off blocks when global Speeder
-                      is on (blacklist); on allows when global is off
-                      (whitelist)&mdash;same pairing as Defaults &rarr;
-                      Enable.</em
-                    ></span
-                  >
                   <input type="checkbox" class="site-enabled" />
                 </label>
               </div>
               <div class="site-rule-content">
                 <div class="site-rule-override-section">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override placement for this site</span>
-                      >Override placement for this site<br /><em
-                        >When on, location and margin below replace general
-                        defaults for matching URLs.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-placement" />
                   </label>
                   <div class="site-placement-container">
                     <div class="site-rule-option site-rule-option-field">
-                      <label
+                      <label>Default controller location:</label>
-                        >Default controller location:<br /><em
-                          >Corner or edge anchor for the hover bar. Replaces the
-                          general default for matching URLs only.</em
-                        ></label
-                      >
                       <select class="site-controllerLocation">
                         <option value="top-left">Top left</option>
                         <option value="top-center">Top center</option>
@@ -660,8 +595,7 @@
                     <div class="site-rule-option site-rule-margin-option">
                       <label
                         >Controller margin (px):<br /><em
-                          >Shifts the whole control from its preset position (CSS
+                          >Shifts the whole control. 0&ndash;200.</em
-                          margins). Top and bottom. 0&ndash;200.</em
                         ></label
                       >
                       <div class="controller-margin-inputs">
@@ -679,163 +613,85 @@
                 </div>
                 <div class="site-rule-override-section">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override hide-by-default for this site</span>
-                      >Override hide-by-default for this site<br /><em
-                        >When on, the hide-by-default toggle below replaces the
-                        general default for matching URLs.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-visibility" />
                   </label>
                   <div class="site-visibility-container">
                     <div class="site-rule-option site-rule-option-checkbox">
-                      <label
+                      <label>Hide controller by default:</label>
-                        >Hide controller by default:<br /><em
-                          >Starts with the overlay hidden; use shortcuts
-                          (show/hide, move) or site behavior to reveal it.</em
-                        ></label
-                      >
                       <input type="checkbox" class="site-startHidden" />
                     </div>
                   </div>
                 </div>
                 <div class="site-rule-override-section">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override auto-hide for this site</span>
-                      >Override auto-hide for this site<br /><em
-                        >When on, hide-with-controls and timer below replace
-                        general defaults for matching URLs.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-autohide" />
                   </label>
                   <div class="site-autohide-container">
                     <div class="site-rule-option site-rule-option-checkbox">
                       <label class="site-rule-split-label">
-                        <span
+                        <span>Hide with controls (idle-based)</span>
-                          >Hide with controls (idle-based)<br /><em
-                            >Fade the controller in and out with the video
-                            interface: perfect sync on YouTube, idle-based
-                            elsewhere.</em
-                          ></span
-                        >
                         <input type="checkbox" class="site-hideWithControls" />
                       </label>
                     </div>
                     <div class="site-rule-option site-rule-option-field">
-                      <label
+                      <label>Auto-hide timer (0.1&ndash;15s):</label>
-                        >Auto-hide timer (0.1&ndash;15s):<br /><em
-                          >Seconds of inactivity before hiding: 0.1&ndash;15 for
-                          non-YouTube sites.</em
-                        ></label
-                      >
                       <input type="text" class="site-hideWithControlsTimer" />
                     </div>
                   </div>
                 </div>
                 <div class="site-rule-override-section">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override playback for this site</span>
-                      >Override playback for this site<br /><em
-                        >When on, remember speed / force / audio below replace
-                        general defaults for matching URLs.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-playback" />
                   </label>
                   <div class="site-playback-container">
                     <div class="site-rule-option site-rule-option-checkbox">
-                      <label
+                      <label>Remember playback speed:</label>
-                        >Remember playback speed:<br /><em
-                          >Stores speed per source so revisiting the same media
-                          can restore it. Separate from &ldquo;Force last saved
-                          speed,&rdquo; which fights players that reset
-                          rate.</em
-                        ></label
-                      >
                       <input type="checkbox" class="site-rememberSpeed" />
                     </div>
                     <div class="site-rule-option site-rule-option-checkbox">
-                      <label
+                      <label>Force last saved speed:</label>
-                        >Force last saved speed:<br /><em
-                          >Useful when a video player tries to override the speed
-                          you set in Speeder.</em
-                        ></label
-                      >
                       <input type="checkbox" class="site-forceLastSavedSpeed" />
                     </div>
                     <div class="site-rule-option site-rule-option-checkbox">
-                      <label
+                      <label>Work on audio:</label>
-                        >Work on audio:<br /><em
-                          >Also controls plain HTML5 audio (not just video). Turn
-                          off if you only want Speeder on video players.</em
-                        ></label
-                      >
                       <input type="checkbox" class="site-audioBoolean" />
                     </div>
                   </div>
                 </div>
                 <div class="site-rule-override-section">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override opacity for this site</span>
-                      >Override opacity for this site<br /><em
-                        >When on, opacity below replaces the general default for
-                        matching URLs.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-opacity" />
                   </label>
                   <div class="site-opacity-container">
                     <div class="site-rule-option site-rule-option-field">
-                      <label
+                      <label>Controller opacity:</label>
-                        >Controller opacity:<br /><em
-                          >0&ndash;1 (decimals). Lower is more transparent.
-                          Applies to the in-page controller only.</em
-                        ></label
-                      >
                       <input type="text" class="site-controllerOpacity" />
                     </div>
                   </div>
                 </div>
                 <div class="site-rule-override-section">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override subtitle nudge for this site</span>
-                      >Override subtitle nudge for this site<br /><em
-                        >When on, nudge options below replace general defaults for
-                        matching URLs.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-subtitleNudge" />
                   </label>
                   <div class="site-subtitleNudge-container">
                     <div class="site-rule-option site-rule-option-checkbox">
-                      <label
+                      <label>Enable subtitle nudge:</label>
-                        >Enable subtitle nudge:<br /><em
-                          >Makes tiny playback changes to help keep subtitles
-                          aligned.</em
-                        ></label
-                      >
                       <input type="checkbox" class="site-enableSubtitleNudge" />
                     </div>
                     <div class="site-rule-option site-rule-option-field">
-                      <label
+                      <label>Nudge interval (10&ndash;1000ms):</label>
-                        >Nudge interval (10&ndash;1000ms):<br /><em
-                          >How often to nudge: 10&ndash;1000. Smaller values are
-                          more frequent. Default: 50.</em
-                        ></label
-                      >
                       <input type="text" class="site-subtitleNudgeInterval" placeholder="50" />
                     </div>
                   </div>
                 </div>
                 <div class="site-rule-controlbar">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override in-player control bar for this site</span>
-                      >Override in-player control bar for this site<br /><em
-                        >Same idea as Hover control bar: drag blocks between
-                        Active and Available for matching URLs only.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-controlbar" />
                   </label>
                   <div class="site-controlbar-container">
@@ -853,22 +709,12 @@
                 </div>
                 <div class="site-rule-controlbar">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override extension popup for this site</span>
-                      >Override extension popup for this site<br /><em
-                        >Popup layout for matching URLs; mirrors the global Popup
-                        control bar when you customize it here.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-popup-controlbar" />
                   </label>
                   <div class="site-popup-controlbar-container">
                     <div class="site-rule-option site-rule-option-checkbox">
-                      <label
+                      <label>Show popup control bar</label>
-                        >Show popup control bar<br /><em
-                          >Shows buttons in the extension popup (toolbar icon).
-                          Replaces the general default for this pattern.</em
-                        ></label
-                      >
                       <input type="checkbox" class="site-showPopupControlBar" />
                     </div>
                     <div class="cb-editor">
@@ -885,23 +731,10 @@
                 </div>
                 <div class="site-rule-shortcuts">
                   <label class="site-override-lead">
-                    <span
+                    <span>Override shortcuts for this site</span>
-                      >Override shortcuts for this site<br /><em
-                        >Add shortcuts from the menu; none by default. Leave off
-                        to use global Shortcuts.</em
-                      ></span
-                    >
                     <input type="checkbox" class="override-shortcuts" />
                   </label>
-                  <div class="site-shortcuts-container">
+                  <div class="site-shortcuts-container"></div>
-                    <div class="site-shortcuts-rows"></div>
-                    <select
-                      class="site-add-shortcut-selector"
-                      aria-label="Add shortcut for this site"
-                    >
-                      <option value="">Add shortcut&hellip;</option>
-                    </select>
-                  </div>
                 </div>
               </div>
             </div>

options.js

@@ -319,70 +319,6 @@ function refreshAddShortcutSelector() {
   }
 }
 
-function refreshSiteRuleAddShortcutSelector(ruleEl) {
-  if (!ruleEl) return;
-  var selector = ruleEl.querySelector(".site-add-shortcut-selector");
-  if (!selector) return;
-
-  while (selector.options.length > 1) {
-    selector.remove(1);
-  }
-
-  var usedActions = new Set();
-  ruleEl.querySelectorAll(".site-shortcuts-rows .shortcut-row.customs").forEach(function (row) {
-    var action = row.dataset.action;
-    if (action) usedActions.add(action);
-  });
-
-  Object.keys(actionLabels).forEach(function (action) {
-    if (!usedActions.has(action)) {
-      var option = document.createElement("option");
-      option.value = action;
-      option.textContent = actionLabels[action];
-      selector.appendChild(option);
-    }
-  });
-
-  var overrideShortcutsOn =
-    ruleEl.querySelector(".override-shortcuts") &&
-    ruleEl.querySelector(".override-shortcuts").checked;
-
-  if (selector.options.length === 1) {
-    selector.disabled = true;
-    selector.options[0].text = "All shortcuts added";
-  } else {
-    selector.disabled = !overrideShortcutsOn;
-    selector.options[0].text = "Add shortcut\u2026";
-  }
-}
-
-function getGlobalBindingSnapshotForSiteShortcut(action) {
-  var row = document.querySelector(
-    '#customs .shortcut-row[data-action="' + action + '"]'
-  );
-  if (row) {
-    var keyInput = row.querySelector(".customKey");
-    var binding = normalizeStoredBinding(keyInput && keyInput.vscBinding);
-    if (binding) {
-      var valueInput = row.querySelector(".customValue");
-      var value = customActionsNoValues.includes(action)
-        ? 0
-        : Number(valueInput && valueInput.value);
-      return { binding: binding, value: value };
-    }
-  }
-  var def = tcDefaults.keyBindings.find(function (b) {
-    return b.action === action;
-  });
-  if (def) {
-    return {
-      binding: normalizeStoredBinding(def),
-      value: def.value
-    };
-  }
-  return { binding: null, value: undefined };
-}
-
 function ensureDefaultBinding(storage, action, code, value) {
   if (storage.keyBindings.some((item) => item.action === action)) return;
 
@@ -1006,18 +942,35 @@ function ensureAllDefaultBindings(storage) {
   });
 }
 
-function addSiteRuleShortcut(rowsEl, action, binding, value, force) {
+function addSiteRuleShortcut(container, action, binding, value, force) {
-  if (!rowsEl) return;
-
   var div = document.createElement("div");
   div.setAttribute("class", "shortcut-row customs");
   div.dataset.action = action;
 
   var actionLabel = document.createElement("div");
   actionLabel.className = "shortcut-label";
+  var actionLabels = {
+    display: "Show/hide controller",
+    move: "Move controller",
+    slower: "Decrease speed",
+    faster: "Increase speed",
+    rewind: "Rewind",
+    advance: "Advance",
+    reset: "Reset speed",
+    fast: "Preferred speed",
+    toggleSubtitleNudge: "Toggle subtitle nudge",
+    pause: "Play / Pause",
+    muted: "Mute / Unmute",
+    louder: "Increase volume",
+    softer: "Decrease volume",
+    mark: "Set marker",
+    jump: "Jump to marker"
+  };
   var actionLabelText = actionLabels[action] || action;
   if (action === "toggleSubtitleNudge") {
-    var ruleEl = rowsEl.closest(".site-rule");
+    // Check if the site rule is for YouTube.
+    // We look up the pattern from the site rule element this container belongs to.
+    var ruleEl = container.closest(".site-rule");
     var pattern = ruleEl ? ruleEl.querySelector(".site-pattern").value : "";
     if (!pattern.toLowerCase().includes("youtube.com")) {
       actionLabelText += " (only for YouTube embeds)";
@@ -1061,18 +1014,12 @@ function addSiteRuleShortcut(rowsEl, action, binding, value, force) {
   forceLabel.appendChild(forceCheckbox);
   forceLabel.appendChild(forceText);
 
-  var removeButton = document.createElement("button");
-  removeButton.className = "removeParent";
-  removeButton.type = "button";
-  removeButton.textContent = "\u00d7";
-
   div.appendChild(actionLabel);
   div.appendChild(keyInput);
   div.appendChild(valueInput);
   div.appendChild(forceLabel);
-  div.appendChild(removeButton);
 
-  rowsEl.appendChild(div);
+  container.appendChild(div);
 }
 
 function createSiteRule(rule) {
@@ -1210,24 +1157,56 @@ function createSiteRule(rule) {
     rule && Array.isArray(rule.shortcuts) && rule.shortcuts.length > 0
   );
   ruleEl.querySelector(".override-shortcuts").checked = hasShortcutOverride;
-  var rowsEl = ruleEl.querySelector(".site-shortcuts-rows");
+  var container = ruleEl.querySelector(".site-shortcuts-container");
   if (hasShortcutOverride) {
     rule.shortcuts.forEach((shortcut) => {
       addSiteRuleShortcut(
-        rowsEl,
+        container,
         shortcut.action,
         shortcut,
         shortcut.value,
         shortcut.force
       );
     });
+  } else {
+    populateDefaultSiteShortcuts(container);
   }
   applySiteRuleOverrideState(ruleEl, "override-shortcuts", "site-shortcuts-container");
-  refreshSiteRuleAddShortcutSelector(ruleEl);
 
   document.getElementById("siteRulesContainer").appendChild(ruleEl);
 }
 
+function populateDefaultSiteShortcuts(container) {
+  var bindings = [];
+  document.querySelectorAll("#customs .shortcut-row").forEach((row) => {
+    var action = row.dataset.action;
+    if (!action) return;
+
+    var keyInput = row.querySelector(".customKey");
+    var binding = normalizeStoredBinding(keyInput && keyInput.vscBinding);
+    if (!binding) return;
+
+    var valueInput = row.querySelector(".customValue");
+    bindings.push({
+      action: action,
+      code: binding.code,
+      disabled: binding.disabled === true,
+      value: customActionsNoValues.includes(action)
+        ? 0
+        : Number(valueInput && valueInput.value),
+      force: false
+    });
+  });
+
+  if (bindings.length === 0) {
+    bindings = tcDefaults.keyBindings.slice();
+  }
+
+  bindings.forEach((binding) => {
+    addSiteRuleShortcut(container, binding.action, binding, binding.value, false);
+  });
+}
+
 function createControlBarBlock(buttonId) {
   var def = controllerButtonDefs[buttonId];
   if (!def) return null;
@@ -1801,13 +1780,8 @@ document.addEventListener("DOMContentLoaded", function () {
 
     var removeParentButton = targetEl.closest(".removeParent");
     if (removeParentButton) {
-      var removedRow = removeParentButton.parentNode;
+      removeParentButton.parentNode.remove();
-      var siteRuleForShortcut = removedRow.closest(".site-rule");
-      removedRow.remove();
       refreshAddShortcutSelector();
-      if (siteRuleForShortcut) {
-        refreshSiteRuleAddShortcutSelector(siteRuleForShortcut);
-      }
       return;
     }
     var removeSiteRuleButton = targetEl.closest(".remove-site-rule");
@@ -1834,26 +1808,6 @@ document.addEventListener("DOMContentLoaded", function () {
       }
     }
 
-    if (event.target.classList.contains("site-add-shortcut-selector")) {
-      var action = event.target.value;
-      if (!action) return;
-      var siteRuleRoot = event.target.closest(".site-rule");
-      var rows = siteRuleRoot && siteRuleRoot.querySelector(".site-shortcuts-rows");
-      if (rows) {
-        var snap = getGlobalBindingSnapshotForSiteShortcut(action);
-        addSiteRuleShortcut(
-          rows,
-          action,
-          snap.binding,
-          snap.value,
-          false
-        );
-        refreshSiteRuleAddShortcutSelector(siteRuleRoot);
-      }
-      event.target.value = "";
-      return;
-    }
-
     // Site rule: show/hide optional override sections
     var siteOverrideContainers = {
       "override-placement": "site-placement-container",
@@ -1875,9 +1829,6 @@ document.addEventListener("DOMContentLoaded", function () {
         if (targetBox) {
           setSiteOverrideContainerState(targetBox, event.target.checked);
         }
-        if (ocb === "override-shortcuts") {
-          refreshSiteRuleAddShortcutSelector(siteRuleRoot);
-        }
         return;
       }
     }

popup.js

@@ -279,10 +279,7 @@ document.addEventListener("DOMContentLoaded", function () {
         var url = context && context.url ? context.url : "";
         var siteRule = matchSiteRule(url, storage.siteRules);
         var siteDisabled = isSiteRuleDisabled(siteRule);
-        var siteAvailable = siteRuleUtils.isSpeederActiveForSite(
+        var siteAvailable = storage.enabled !== false && !siteDisabled;
-          storage.enabled,
-          siteRule
-        );
         var showBar = storage.showPopupControlBar !== false;
 
         if (siteRule && siteRule.showPopupControlBar !== undefined) {

shared/site-rules.js

@@ -60,28 +60,10 @@
     );
   }
 
-  /**
-   * Whether Speeder should run on this URL given global enabled and the matched rule (if any).
-   * - No rule: follows global (enabled unless explicitly false).
-   * - Rule with site "off" / disableExtension: always inactive (blacklist).
-   * - Rule with site "on": active even when global is off (whitelist).
-   */
-  function isSpeederActiveForSite(globalEnabled, siteRule) {
-    var globalOn = globalEnabled !== false;
-    if (!siteRule) {
-      return globalOn;
-    }
-    if (isSiteRuleDisabled(siteRule)) {
-      return false;
-    }
-    return true;
-  }
-
   return {
     compileSiteRulePattern: compileSiteRulePattern,
     escapeStringRegExp: escapeStringRegExp,
     isSiteRuleDisabled: isSiteRuleDisabled,
-    isSpeederActiveForSite: isSpeederActiveForSite,
     matchSiteRule: matchSiteRule
   };
 });

tests/inject.test.js

@@ -51,28 +51,6 @@ async function bootInject({ sync = {}, local = {} } = {}) {
 }
 
 describe("inject runtime", () => {
-  it("treats a matching site rule with site enabled as active when global enable is off", async () => {
-    await bootInject({
-      sync: {
-        enabled: false,
-        siteRules: [{ pattern: "example.org", enabled: true }]
-      }
-    });
-
-    expect(window.tc.settings.enabled).toBe(false);
-    window.captureSiteRuleBase();
-    window.applySiteRuleOverrides();
-    expect(window.tc.activeSiteRule).toEqual(
-      expect.objectContaining({ pattern: "example.org", enabled: true })
-    );
-    expect(
-      window.SpeederShared.siteRules.isSpeederActiveForSite(
-        window.tc.settings.enabled,
-        window.tc.activeSiteRule
-      )
-    ).toBe(true);
-  });
-
   it("keeps subtitle nudge disabled when the effective setting is off", async () => {
     await bootInject({
       sync: {

tests/options.integration.test.js

@@ -96,32 +96,6 @@ describe("options page", () => {
     expect(toggle.getAttribute("aria-label")).toBe("Collapse site rule");
   });
 
-  it("site rule shortcut override shows no rows by default and adds via selector", async () => {
-    await setupOptions({ sync: { siteRules: [] } });
-
-    globalThis.createSiteRule({ pattern: "example.com" });
-    const rule = document.getElementById("siteRulesContainer").lastElementChild;
-    const rows = rule.querySelector(".site-shortcuts-rows");
-    const selector = rule.querySelector(".site-add-shortcut-selector");
-
-    expect(rows.querySelectorAll(".shortcut-row").length).toBe(0);
-    expect(selector).not.toBeNull();
-    expect(selector.disabled).toBe(true);
-
-    rule.querySelector(".override-shortcuts").checked = true;
-    rule.querySelector(".override-shortcuts").dispatchEvent(
-      new Event("change", { bubbles: true })
-    );
-
-    expect(selector.disabled).toBe(false);
-    expect(selector.options.length).toBeGreaterThan(1);
-
-    selector.value = "pause";
-    selector.dispatchEvent(new Event("change", { bubbles: true }));
-
-    expect(rows.querySelectorAll('.shortcut-row[data-action="pause"]').length).toBe(1);
-  });
-
   it("keeps site override settings visible but disabled until enabled", async () => {
     await setupOptions({ sync: { siteRules: [] } });
 

tests/popup.integration.test.js

@@ -36,22 +36,6 @@ describe("popup UI", () => {
     ).toBeGreaterThan(0);
   });
 
-  it("shows controls when globally disabled but a whitelist site rule matches", async () => {
-    await setupPopup({
-      sync: {
-        enabled: false,
-        siteRules: [{ pattern: "example.com", enabled: true }]
-      }
-    });
-
-    expect(document.getElementById("status").classList.contains("hide")).toBe(
-      true
-    );
-    expect(document.getElementById("popupControlBar").style.display).not.toBe(
-      "none"
-    );
-  });
-
   it("shows disabled state for a matching site rule", async () => {
     await setupPopup({
       sync: {

tests/shared.test.js

@@ -24,20 +24,6 @@ describe("shared helpers", () => {
     expect(siteRules.isSiteRuleDisabled({ enabled: false })).toBe(true);
   });
 
-  it("combines global enabled with matched site rules (whitelist / blacklist)", () => {
-    const allowSite = { pattern: "good.test", enabled: true };
-    const blockSite = { pattern: "bad.test", enabled: false };
-
-    expect(siteRules.isSpeederActiveForSite(true, null)).toBe(true);
-    expect(siteRules.isSpeederActiveForSite(false, null)).toBe(false);
-
-    expect(siteRules.isSpeederActiveForSite(true, blockSite)).toBe(false);
-    expect(siteRules.isSpeederActiveForSite(false, blockSite)).toBe(false);
-
-    expect(siteRules.isSpeederActiveForSite(true, allowSite)).toBe(true);
-    expect(siteRules.isSpeederActiveForSite(false, allowSite)).toBe(true);
-  });
-
   it("sanitizes and resolves popup button orders", () => {
     const controllerButtonDefs = {
       rewind: {},