Release v5.1.4

.github/workflows/deploy.yml

@@ -10,8 +10,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      WEB_EXT_IGNORE_FILES: scripts/**
 
     steps:
       - uses: actions/checkout@v4

inject.js

@@ -776,40 +776,27 @@ function setSubtitleNudgeEnabledForVideo(video, enabled) {
   return normalizedEnabled;
 }
 
-function renderSubtitleNudgeIndicatorContent(target, isEnabled) {
-  if (!target) return;
+function subtitleNudgeIconMarkup(isEnabled) {
   var action = isEnabled ? "subtitleNudgeOn" : "subtitleNudgeOff";
   var custom =
     tc.settings.customButtonIcons &&
     tc.settings.customButtonIcons[action] &&
     tc.settings.customButtonIcons[action].svg;
-  vscClearElement(target);
   if (custom) {
-    var customWrap = vscCreateSvgWrap(
-      target.ownerDocument || document,
-      custom,
-      "vsc-btn-icon"
+    return (
+      '<span class="vsc-btn-icon" aria-hidden="true">' + custom + "</span>"
     );
-    if (customWrap) {
-      target.appendChild(customWrap);
-      return;
-    }
   }
   if (typeof vscIconSvgString !== "function") {
-    target.textContent = isEnabled ? "✓" : "×";
-    return;
+    return isEnabled ? "✓" : "×";
   }
   var svg = vscIconSvgString(action, 14);
   if (!svg) {
-    target.textContent = isEnabled ? "✓" : "×";
-    return;
+    return isEnabled ? "✓" : "×";
   }
-  var wrap = vscCreateSvgWrap(target.ownerDocument || document, svg, "vsc-btn-icon");
-  if (wrap) {
-    target.appendChild(wrap);
-    return;
-  }
-  target.textContent = isEnabled ? "✓" : "×";
+  return (
+    '<span class="vsc-btn-icon" aria-hidden="true">' + svg + "</span>"
+  );
 }
 
 function updateSubtitleNudgeIndicator(video) {
@@ -817,10 +804,11 @@ function updateSubtitleNudgeIndicator(video) {
 
   var isEnabled = isSubtitleNudgeEnabledForVideo(video);
   var title = isEnabled ? "Subtitle nudge enabled" : "Subtitle nudge disabled";
+  var mark = subtitleNudgeIconMarkup(isEnabled);
 
   var indicator = video.vsc.subtitleNudgeIndicator;
   if (indicator) {
-    renderSubtitleNudgeIndicatorContent(indicator, isEnabled);
+    indicator.innerHTML = mark;
     indicator.dataset.enabled = isEnabled ? "true" : "false";
     indicator.dataset.supported = "true";
     indicator.title = title;
@@ -829,7 +817,7 @@ function updateSubtitleNudgeIndicator(video) {
 
   var flashEl = video.vsc.nudgeFlashIndicator;
   if (flashEl) {
-    renderSubtitleNudgeIndicatorContent(flashEl, isEnabled);
+    flashEl.innerHTML = mark;
     flashEl.dataset.enabled = isEnabled ? "true" : "false";
     flashEl.dataset.supported = "true";
     flashEl.setAttribute("aria-label", title);
@@ -1369,15 +1357,12 @@ chrome.storage.sync.get(tc.settings, function (storage) {
                 tc.settings.customButtonIcons &&
                 tc.settings.customButtonIcons[act] &&
                 tc.settings.customButtonIcons[act].svg;
-              vscClearElement(btn);
+              btn.innerHTML = "";
               if (svg) {
-                var cw = vscCreateSvgWrap(doc, svg, "vsc-btn-icon");
-                if (cw) {
-                  btn.appendChild(cw);
-                } else {
-                  var cdf = controllerButtonDefs[act];
-                  btn.textContent = (cdf && cdf.label) || "?";
-                }
+                var cw = doc.createElement("span");
+                cw.className = "vsc-btn-icon";
+                cw.innerHTML = svg;
+                btn.appendChild(cw);
               } else if (typeof vscIconWrap === "function") {
                 var wrap = vscIconWrap(doc, act, 14);
                 if (wrap) {
@@ -1420,12 +1405,10 @@ function createControllerButton(doc, action, label, className) {
     tc.settings.customButtonIcons[action] &&
     tc.settings.customButtonIcons[action].svg;
   if (custom) {
-    var customWrap = vscCreateSvgWrap(doc, custom, "vsc-btn-icon");
-    if (customWrap) {
-      button.appendChild(customWrap);
-    } else {
-      button.textContent = label || "?";
-    }
+    var customWrap = doc.createElement("span");
+    customWrap.className = "vsc-btn-icon";
+    customWrap.innerHTML = custom;
+    button.appendChild(customWrap);
   } else if (typeof vscIconWrap === "function") {
     var wrap = vscIconWrap(doc, action, 14);
     if (wrap) {

lucide-client.js

@@ -31,9 +31,32 @@ function sanitizeLucideSvg(svgText) {
   var t = String(svgText).replace(/\0/g, "").trim();
   if (!/<svg[\s>]/i.test(t)) return null;
   var doc = new DOMParser().parseFromString(t, "image/svg+xml");
-  if (doc.querySelector("parsererror")) return null;
-  var svg = vscSanitizeSvgTree(doc.querySelector("svg"));
+  var svg = doc.querySelector("svg");
   if (!svg) return null;
+  svg.querySelectorAll("script").forEach(function (n) {
+    n.remove();
+  });
+  svg.querySelectorAll("style").forEach(function (n) {
+    n.remove();
+  });
+  svg.querySelectorAll("*").forEach(function (el) {
+    for (var i = el.attributes.length - 1; i >= 0; i--) {
+      var attr = el.attributes[i];
+      var name = attr.name.toLowerCase();
+      var val = attr.value;
+      if (name.indexOf("on") === 0) {
+        el.removeAttribute(attr.name);
+        continue;
+      }
+      if (
+        (name === "href" || name === "xlink:href") &&
+        /^javascript:/i.test(val)
+      ) {
+        el.removeAttribute(attr.name);
+      }
+    }
+  });
+  svg.setAttribute("xmlns", "http://www.w3.org/2000/svg");
   svg.removeAttribute("width");
   svg.removeAttribute("height");
   svg.setAttribute("width", "100%");

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Speeder",
   "short_name": "Speeder",
-  "version": "5.1.6",
+  "version": "5.1.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.js

@@ -172,9 +172,8 @@ var customButtonIconsLive = {};
 
 function fillControlBarIconElement(icon, buttonId) {
   if (!icon || !buttonId) return;
-  var doc = icon.ownerDocument || document;
   if (buttonId === "nudge") {
-    vscClearElement(icon);
+    icon.innerHTML = "";
     icon.className = "cb-icon cb-icon-nudge-pair";
     function nudgeChipMarkup(action) {
       var c = customButtonIconsLive[action];
@@ -190,10 +189,10 @@ function fillControlBarIconElement(icon, buttonId) {
       sp.setAttribute("data-nudge-state", stateKey);
       var inner = nudgeChipMarkup(action);
       if (inner) {
-        var wrap = vscCreateSvgWrap(doc, inner, "vsc-btn-icon");
-        if (wrap) {
-          sp.appendChild(wrap);
-        }
+        var wrap = document.createElement("span");
+        wrap.className = "vsc-btn-icon";
+        wrap.innerHTML = inner;
+        sp.appendChild(wrap);
       }
       icon.appendChild(sp);
     }
@@ -208,15 +207,16 @@ function fillControlBarIconElement(icon, buttonId) {
   icon.className = "cb-icon";
   var custom = customButtonIconsLive[buttonId];
   if (custom && custom.svg) {
-    if (vscSetSvgContent(icon, custom.svg)) return;
+    icon.innerHTML = custom.svg;
+    return;
   }
   if (typeof vscIconSvgString === "function") {
     var svgHtml = vscIconSvgString(buttonId, 16);
     if (svgHtml) {
-      if (vscSetSvgContent(icon, svgHtml)) return;
+      icon.innerHTML = svgHtml;
+      return;
     }
   }
-  vscClearElement(icon);
   var def = controllerButtonDefs[buttonId];
   icon.textContent = (def && def.icon) || "?";
 }
@@ -1200,8 +1200,8 @@ function createControlBarBlock(buttonId) {
 }
 
 function populateControlBarZones(activeZone, availableZone, activeIds, allowButtonId) {
-  vscClearElement(activeZone);
-  vscClearElement(availableZone);
+  activeZone.innerHTML = "";
+  availableZone.innerHTML = "";
 
   var allowed = function (id) {
     if (!controllerButtonDefs[id]) return false;
@@ -1394,7 +1394,7 @@ function initLucideButtonIconsUI() {
 
   if (!actionSel.dataset.lucideInit) {
     actionSel.dataset.lucideInit = "1";
-    vscClearElement(actionSel);
+    actionSel.innerHTML = "";
     Object.keys(controllerButtonDefs).forEach(function (aid) {
       if (aid === "nudge") {
         Object.keys(lucideSubtitleNudgeActionLabels).forEach(function (subId) {
@@ -1415,7 +1415,7 @@ function initLucideButtonIconsUI() {
   }
 
   function renderResults(slugs) {
-    vscClearElement(resultsEl);
+    resultsEl.innerHTML = "";
     slugs.forEach(function (slug) {
       var b = document.createElement("button");
       b.type = "button";
@@ -1450,13 +1450,11 @@ function initLucideButtonIconsUI() {
           .then(function (txt) {
             var safe = sanitizeLucideSvg(txt);
             if (!safe) throw new Error("Bad SVG");
-            if (!vscSetSvgContent(previewEl, safe)) {
-              throw new Error("Preview render failed");
-            }
+            previewEl.innerHTML = safe;
             setLucideStatus("Preview: " + slug);
           })
           .catch(function (e) {
-            vscClearElement(previewEl);
+            previewEl.innerHTML = "";
             setLucideStatus(
               "Could not load: " + slug + " — " + e.message
             );
@@ -1475,7 +1473,7 @@ function initLucideButtonIconsUI() {
           .then(function (map) {
             var q = searchInput.value;
             if (!q.trim()) {
-              vscClearElement(resultsEl);
+              resultsEl.innerHTML = "";
               return;
             }
             renderResults(searchLucideSlugs(map, q, 48));
@@ -1640,7 +1638,7 @@ function restore_options() {
         ? storage.siteRules
         : tcDefaults.siteRules || [];
 
-    vscClearElement(document.getElementById("siteRulesContainer"));
+    document.getElementById("siteRulesContainer").innerHTML = "";
     if (siteRules.length > 0) {
       siteRules.forEach((rule) => {
         if (rule && rule.pattern) {

popup.js

@@ -230,21 +230,17 @@ document.addEventListener("DOMContentLoaded", function () {
       btn.dataset.action = btnId;
       var customEntry = customMap[btnId];
       if (customEntry && customEntry.svg) {
-        var customSpan = vscCreateSvgWrap(document, customEntry.svg, "vsc-btn-icon");
-        if (customSpan) {
-          btn.appendChild(customSpan);
-        } else {
-          btn.textContent = def.label || "?";
-        }
+        var customSpan = document.createElement("span");
+        customSpan.className = "vsc-btn-icon";
+        customSpan.innerHTML = customEntry.svg;
+        btn.appendChild(customSpan);
       } else if (typeof vscIconSvgString === "function") {
         var svgStr = vscIconSvgString(btnId, 16);
         if (svgStr) {
-          var iconSpan = vscCreateSvgWrap(document, svgStr, "vsc-btn-icon");
-          if (iconSpan) {
-            btn.appendChild(iconSpan);
-          } else {
-            btn.textContent = def.label || "?";
-          }
+          var iconSpan = document.createElement("span");
+          iconSpan.className = "vsc-btn-icon";
+          iconSpan.innerHTML = svgStr;
+          btn.appendChild(iconSpan);
         } else {
           btn.textContent = def.label || "?";
         }

ui-icons.js

@@ -3,7 +3,6 @@
  * Use stroke="currentColor" so buttons inherit foreground for monochrome UI.
  */
 var VSC_ICON_SIZE_DEFAULT = 18;
-var VSC_SVG_NS = "http://www.w3.org/2000/svg";
 
 /** Inner SVG markup only (paths / shapes inside <svg>). */
 var vscUiIconPaths = {
@@ -55,79 +54,6 @@ function vscIconSvgString(action, size) {
   );
 }
 
-function vscClearElement(el) {
-  if (!el) return;
-  while (el.firstChild) {
-    el.removeChild(el.firstChild);
-  }
-}
-
-function vscSanitizeSvgTree(svg) {
-  if (!svg || String(svg.tagName).toLowerCase() !== "svg") return null;
-
-  svg.querySelectorAll("script, style, foreignObject").forEach(function (n) {
-    n.remove();
-  });
-
-  svg.querySelectorAll("*").forEach(function (el) {
-    for (var i = el.attributes.length - 1; i >= 0; i--) {
-      var attr = el.attributes[i];
-      var name = attr.name.toLowerCase();
-      var val = attr.value;
-      if (name.indexOf("on") === 0) {
-        el.removeAttribute(attr.name);
-        continue;
-      }
-      if (
-        (name === "href" || name === "xlink:href") &&
-        /^\s*javascript:/i.test(val)
-      ) {
-        el.removeAttribute(attr.name);
-      }
-    }
-  });
-
-  svg.setAttribute("xmlns", VSC_SVG_NS);
-  svg.setAttribute("aria-hidden", "true");
-  return svg;
-}
-
-function vscCreateSvgNode(doc, svgText) {
-  if (!doc || !svgText || typeof svgText !== "string") return null;
-  var clean = String(svgText).replace(/\0/g, "").trim();
-  if (!clean || !/<svg[\s>]/i.test(clean)) return null;
-
-  var parsed = new DOMParser().parseFromString(clean, "image/svg+xml");
-  if (parsed.querySelector("parsererror")) return null;
-
-  var svg = vscSanitizeSvgTree(parsed.querySelector("svg"));
-  if (!svg) return null;
-
-  return doc.importNode(svg, true);
-}
-
-function vscSetSvgContent(el, svgText) {
-  if (!el) return false;
-  vscClearElement(el);
-
-  var doc = el.ownerDocument || document;
-  var svg = vscCreateSvgNode(doc, svgText);
-  if (!svg) return false;
-
-  el.appendChild(svg);
-  return true;
-}
-
-function vscCreateSvgWrap(doc, svgText, className) {
-  if (!doc) return null;
-  var span = doc.createElement("span");
-  span.className = className || "vsc-btn-icon";
-  if (!vscSetSvgContent(span, svgText)) {
-    return null;
-  }
-  return span;
-}
-
 /**
  * @param {Document} doc
  * @param {string} action
@@ -136,5 +62,8 @@ function vscCreateSvgWrap(doc, svgText, className) {
 function vscIconWrap(doc, action, size) {
   var html = vscIconSvgString(action, size);
   if (!html) return null;
-  return vscCreateSvgWrap(doc, html, "vsc-btn-icon");
+  var span = doc.createElement("span");
+  span.className = "vsc-btn-icon";
+  span.innerHTML = html;
+  return span;
 }