From 2d8a4fc25f475d69d07869e7f178f4397caf0e51 Mon Sep 17 00:00:00 2001 From: Josh Patra <30350506+SoPat712@users.noreply.github.com> Date: Mon, 19 May 2025 12:54:35 -0400 Subject: [PATCH] add nudge to settings --- inject.js | 403 +++++++++++++++++++------------------------------ manifest.json | 6 +- options.html | 64 ++++++-- options.js | 278 +++++++++++++++++----------------- videospeed.xpi | Bin 0 -> 57329 bytes 5 files changed, 352 insertions(+), 399 deletions(-) create mode 100644 videospeed.xpi diff --git a/inject.js b/inject.js index f5b557d..201aec2 100644 --- a/inject.js +++ b/inject.js @@ -2,16 +2,15 @@ var regStrip = /^[\r\t\f\v ]+|[\r\t\f\v ]+$/gm; var tc = { settings: { - lastSpeed: 1.0, // default 1x - enabled: true, // default enabled - speeds: {}, // empty object to hold speed for each source - - displayKeyCode: 86, // default: V - rememberSpeed: false, // default: false - forceLastSavedSpeed: false, //default: false - audioBoolean: false, // default: false - startHidden: false, // default: false - controllerOpacity: 0.3, // default: 0.3 + lastSpeed: 1.0, + enabled: true, + speeds: {}, + displayKeyCode: 86, + rememberSpeed: false, + forceLastSavedSpeed: false, + audioBoolean: false, + startHidden: false, + controllerOpacity: 0.3, keyBindings: [], blacklist: `\ www.instagram.com @@ -27,30 +26,21 @@ var tc = { 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 // ADDED: Flag for nudge operation }; -/* Log levels (depends on caller specifying the correct level) */ +/* Log levels */ function log(message, level) { verbosity = tc.settings.logLevel; - if (typeof level === "undefined") { - level = tc.settings.defaultLogLevel; - } + if (typeof level === "undefined") level = tc.settings.defaultLogLevel; if (verbosity >= level) { - // MODIFIED: Added [VSC] prefix for clarity let prefix = "[VSC] "; - if (level === 2) { - console.log(prefix + "ERROR: " + message); - } else if (level === 3) { - console.log(prefix + "WARNING: " + message); - } else if (level === 4) { - console.log(prefix + "INFO: " + message); - } else if (level === 5) { - console.log(prefix + "DEBUG: " + message); - } else if (level === 6) { + if (level === 2) console.log(prefix + "ERROR: " + message); + else if (level === 3) console.log(prefix + "WARNING: " + message); + else if (level === 4) 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,7 +48,7 @@ function log(message, level) { } chrome.storage.sync.get(tc.settings, function (storage) { - // MODIFIED: Robust keyBinding initialization from storage or defaults. + // MODIFIED: Robust keyBinding initialization tc.settings.keyBindings = Array.isArray(storage.keyBindings) && storage.keyBindings.length > 0 && @@ -99,7 +89,7 @@ chrome.storage.sync.get(tc.settings, function (storage) { value: 1.0, force: false, predefined: true - }, // Default value for reset action is 1.0 + }, { action: "fast", key: Number(storage.fastKeyCode) || 71, @@ -117,7 +107,7 @@ chrome.storage.sync.get(tc.settings, function (storage) { log("Initializing/Updating keybindings in storage.", 4); chrome.storage.sync.set({ keyBindings: tc.settings.keyBindings, - version: "0.6.3.8" + version: "0.6.3.10" }); // Update version } @@ -132,16 +122,16 @@ chrome.storage.sync.get(tc.settings, function (storage) { tc.settings.controllerOpacity = Number(storage.controllerOpacity) || 0.3; tc.settings.blacklist = String(storage.blacklist || tc.settings.blacklist); - if (typeof storage.logLevel !== "undefined") { + if (typeof storage.logLevel !== "undefined") tc.settings.logLevel = Number(storage.logLevel); - } - // ADDED: Load nudge settings from storage + + // ADDED: Load nudge settings 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; @@ -156,18 +146,18 @@ chrome.storage.sync.get(tc.settings, function (storage) { predefined: true }); } - initializeWhenReady(document); }); function getKeyBindings(action, what = "value") { - if (!tc.settings.keyBindings) return false; // ADDED: Guard against undefined keyBindings + // Original getKeyBindings + if (!tc.settings.keyBindings) return false; try { const binding = tc.settings.keyBindings.find( (item) => item.action === action ); if (binding) return binding[what]; - // Fallback defaults for safety + // Fallbacks from original if (what === "value") { if (action === "slower" || action === "faster") return 0.1; if (action === "rewind" || action === "advance") return 10; @@ -181,64 +171,42 @@ function getKeyBindings(action, what = "value") { } } -// Original setKeyBindings, used by original resetSpeed logic. +// Original setKeyBindings from your provided code (used by original resetSpeed) function setKeyBindings(action, value) { - if (!tc.settings.keyBindings) return; // ADDED: Guard + if (!tc.settings.keyBindings) return; const binding = tc.settings.keyBindings.find( (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) { - log(`VSC controller already exists for ${target.src || "video"}.`, 6); - return target.vsc; - } + if (target.vsc) 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.nudgeIntervalId = null; // ADDED: For the subtitle nudge feature + this.nudgeIntervalId = null; // ADDED for nudge - // Original logic for determining initial speed - let storedSpeed; + let storedSpeed; // Original logic 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 + if (!storedSpeed) storedSpeed = 1.0; + setKeyBindings("reset", getKeyBindings("fast")); } else { - log("Recalling stored speed due to rememberSpeed being enabled", 5); storedSpeed = tc.settings.speeds[target.currentSrc] || tc.settings.lastSpeed; } - if (tc.settings.forceLastSavedSpeed) { - storedSpeed = tc.settings.lastSpeed; - } + if (tc.settings.forceLastSavedSpeed) storedSpeed = tc.settings.lastSpeed; this.div = this.initializeControls(); if (Math.abs(target.playbackRate - storedSpeed) > 0.001) { - log( - `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) @@ -251,12 +219,11 @@ function defineVideoController() { } } - // Original mediaEventAction var mediaEventAction = function (event) { + // Original mediaEventAction const video = event.target; if (!video.vsc) return; - - let speedToSet = tc.settings.speeds[video.currentSrc]; // Use 'let' + let speedToSet = tc.settings.speeds[video.currentSrc]; if (!tc.settings.rememberSpeed) { if (!speedToSet) speedToSet = 1.0; setKeyBindings("reset", getKeyBindings("fast")); @@ -266,14 +233,9 @@ function defineVideoController() { if (tc.settings.forceLastSavedSpeed) speedToSet = tc.settings.lastSpeed; if (Math.abs(video.playbackRate - speedToSet) > 0.001) { - log( - `Media event '${event.type}': rate ${video.playbackRate.toFixed(2)} vs target ${speedToSet.toFixed(2)}. Setting.`, - 4 - ); setSpeed(video, speedToSet, false); // MODIFIED: isInitialSet is false } - - // ADDED: Manage nudge based on event type + // ADDED: Manage nudge if (event.type === "play") video.vsc.startSubtitleNudge(); else if (event.type === "pause" || event.type === "ended") video.vsc.stopSubtitleNudge(); @@ -286,32 +248,31 @@ function defineVideoController() { target.addEventListener( "pause", (this.handlePause = mediaEventAction.bind(this)) - ); // ADDED for nudge + ); // ADDED target.addEventListener( "ended", (this.handleEnded = mediaEventAction.bind(this)) - ); // ADDED for nudge + ); // ADDED target.addEventListener( "seeked", (this.handleSeek = mediaEventAction.bind(this)) ); var srcObserver = new MutationObserver((mutations) => { + // Original srcObserver mutations.forEach((mutation) => { if ( mutation.type === "attributes" && (mutation.attributeName === "src" || mutation.attributeName === "currentSrc") ) { - if (!this.div) return; // MODIFIED: Check if div exists - log(`Src changed to: ${mutation.target.currentSrc || "empty"}`, 4); - this.stopSubtitleNudge(); // ADDED: Stop nudge for old src - - if (!mutation.target.src && !mutation.target.currentSrc) { + if (!this.div) return; + this.stopSubtitleNudge(); // ADDED + if (!mutation.target.src && !mutation.target.currentSrc) this.div.classList.add("vsc-nosource"); - } else { + else { this.div.classList.remove("vsc-nosource"); - let newSrcSpeed = tc.settings.speeds[mutation.target.currentSrc]; // MODIFIED: Follow original logic + let newSrcSpeed = tc.settings.speeds[mutation.target.currentSrc]; if (!tc.settings.rememberSpeed) { if (!newSrcSpeed) newSrcSpeed = 1.0; } else { @@ -319,7 +280,6 @@ function defineVideoController() { } if (tc.settings.forceLastSavedSpeed) newSrcSpeed = tc.settings.lastSpeed; - setSpeed(mutation.target, newSrcSpeed, true); // MODIFIED: isInitialSet = true if (!mutation.target.paused && mutation.target.playbackRate !== 1.0) this.startSubtitleNudge(); // ADDED @@ -329,14 +289,13 @@ function defineVideoController() { }); srcObserver.observe(target, { attributeFilter: ["src", "currentSrc"] }); - // ADDED: Initial nudge check - if (!target.paused && target.playbackRate !== 1.0) { - this.startSubtitleNudge(); - } + if (!target.paused && target.playbackRate !== 1.0) + this.startSubtitleNudge(); // ADDED }; // --- Nudge Methods (ADDED) --- tc.videoController.prototype.startSubtitleNudge = function () { + if (!location.hostname.includes("youtube.com")) return; // ADDED: Nudge only on YouTube if ( !tc.settings.enableSubtitleNudge || this.nudgeIntervalId !== null || @@ -347,10 +306,7 @@ function defineVideoController() { this.stopSubtitleNudge(); return; } - log( - `Nudge: Starting for ${this.video.currentSrc || "video"} (Rate: ${this.video.playbackRate.toFixed(2)}) interval: ${tc.settings.subtitleNudgeInterval}ms.`, - 5 - ); + log(`Nudge: Starting interval: ${tc.settings.subtitleNudgeInterval}ms.`, 5); this.nudgeIntervalId = setInterval(() => { if ( !this.video || @@ -363,10 +319,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 && @@ -379,49 +333,43 @@ function defineVideoController() { }); }, tc.settings.subtitleNudgeInterval); }; - tc.videoController.prototype.stopSubtitleNudge = function () { if (this.nudgeIntervalId !== null) { - log( - `Nudge: Stopping for ${this.video ? this.video.currentSrc || "video" : "detached video"}`, - 5 - ); + log(`Nudge: Stopping.`, 5); clearInterval(this.nudgeIntervalId); this.nudgeIntervalId = null; } }; - // --- End Nudge Methods --- tc.videoController.prototype.remove = function () { + // Original remove 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 + this.video.removeEventListener("seeked", this.handleSeek); // Original had "seek" 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 () { + // Original initializeControls log("initializeControls Begin", 5); const doc = this.video.ownerDocument; const speedForUI = this.video.playbackRate.toFixed(2); var 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 = `
- This extension is only compatible with HTML5 audio and video. If you don't - see the controls showing up, chances are you are viewing a Flash content. - If you want to confirm, try right-clicking on the content and inspect the - menu: if it mentions flash, then that's the issue. That said, most sites - will fallback to HTML5 if they detect that Flash is not available. You - can try manually disabling Flash from the browser. + This extension is only compatible with HTML5 audio and video. If you + don't see the controls showing up, chances are you are viewing a Flash + content. If you want to confirm, try right-clicking on the content and + inspect the menu: if it mentions flash, then that's the issue. That + said, most sites will fallback to HTML5 if they detect that Flash + is not available. You can try manually disabling Flash from the browser.
diff --git a/options.js b/options.js index e1b8b95..d33d794 100644 --- a/options.js +++ b/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: ";", - 61: "+", - 173: "-", + 59: ";", + 61: "+", + 173: "-" }; function recordKeyPress(e) { + /* ... same as your original ... */ if ( - (e.keyCode >= 48 && e.keyCode <= 57) || // Numbers 0-9 - (e.keyCode >= 65 && e.keyCode <= 90) || // Letters A-Z - keyCodeAliases[e.keyCode] // Other character keys + (e.keyCode >= 48 && e.keyCode <= 57) || + (e.keyCode >= 65 && e.keyCode <= 90) || + 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) { - document.getElementById(inputId).value = - keyCodeAliases[keyCode] || String.fromCharCode(keyCode); - document.getElementById(inputId).keyCode = keyCode; -} - +// function updateShortcutInputText(inputId, keyCode) { /* ... same as your original ... */ } // Not directly used in provided options.js logic flow 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; } - -// List of custom actions for which customValue should be disabled -var customActionsNoValues = ["pause", "muted", "mark", "jump", "display"]; - +var customActionsNoValues = ["pause", "muted", "mark", "jump", "display"]; // Original function add_shortcut() { - var html = ` - - - - `; + /* ... same as your original ... */ + var html = ``; 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) { - return; - } - keyBindings = []; + if (validate() === false) return; + + keyBindings = []; // Reset global keyBindings before populating from DOM Array.from(document.querySelectorAll(".customs")).forEach((item) => createKeyBindings(item) - ); // Remove added shortcuts + ); - var rememberSpeed = document.getElementById("rememberSpeed").checked; - var forceLastSavedSpeed = document.getElementById("forceLastSavedSpeed").checked; - var audioBoolean = document.getElementById("audioBoolean").checked; - var enabled = document.getElementById("enabled").checked; - var startHidden = document.getElementById("startHidden").checked; - var controllerOpacity = document.getElementById("controllerOpacity").value; - var blacklist = document.getElementById("blacklist").value; + var s = {}; // Object to hold all settings to be saved + s.rememberSpeed = document.getElementById("rememberSpeed").checked; + s.forceLastSavedSpeed = document.getElementById( + "forceLastSavedSpeed" + ).checked; + s.audioBoolean = document.getElementById("audioBoolean").checked; + 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( - { - rememberSpeed: rememberSpeed, - forceLastSavedSpeed: forceLastSavedSpeed, - audioBoolean: audioBoolean, - enabled: enabled, - startHidden: startHidden, - 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); - } - ); + + chrome.storage.sync.set(s, function () { + 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"])) - document.querySelector( + if (customActionsNoValues.includes(item["action"])) { + const el = document.querySelector( "#" + item["action"] + " .customValue" - ).disabled = true; - - updateCustomShortcutInputText( - document.querySelector("#" + item["action"] + " .customKey"), - item["key"] + ); + if (el) el.disabled = true; + } + const keyEl = document.querySelector( + "#" + item["action"] + " .customKey" ); - document.querySelector("#" + item["action"] + " .customValue").value = - item["value"]; - document.querySelector("#" + item["action"] + " .customForce").value = - item["force"]; + const valEl = document.querySelector( + "#" + item["action"] + " .customValue" + ); + 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(); - document - .querySelectorAll(".removeParent") - .forEach((button) => button.click()); // Remove added shortcuts - // Update status to let user know options were saved. + restore_options(); // This will populate based on tcDefaults 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) => { - eventCaller(event, "customValue", inputFilterNumbersOnly); - }); - document.addEventListener("focus", (event) => { - eventCaller(event, "customKey", inputFocus); - }); - document.addEventListener("blur", (event) => { - eventCaller(event, "customKey", inputBlur); - }); - document.addEventListener("keydown", (event) => { - eventCaller(event, "customKey", recordKeyPress); - }); - document.addEventListener("click", (event) => { + document.addEventListener("keypress", (event) => + eventCaller(event, "customValue", inputFilterNumbersOnly) + ); + document.addEventListener("focus", (event) => + eventCaller(event, "customKey", inputFocus) + ); + document.addEventListener("blur", (event) => + eventCaller(event, "customKey", inputBlur) + ); + document.addEventListener("keydown", (event) => + eventCaller(event, "customKey", recordKeyPress) + ); + 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; } diff --git a/videospeed.xpi b/videospeed.xpi new file mode 100644 index 0000000000000000000000000000000000000000..3a81ecbcc0bef31dec0a14b5610f04aca36a009a GIT binary patch literal 57329 zcmV)RK(oJ4O9KQH00008028^eTF!i0*NF%K09q0N00{s908&LkL`_95ZDhSyS(4;5 z5dGIF66S-hqRO@O-fS@}10BIKz_2z%jBKZ?M9Y$qt(SIyswcQ9YRt~zjHgfsRZ`gd>^q%qtQzhGJbzt_h?-)HxN$u z-k+42WSJgMu&~K Z<^= l(jJlaR$I7ALOP0gK6cpWv?MIZuy zB(_ZErxMEQVUoBz3@LpMN%Bi&;`mt4)tnVxj3j9mK9?6b&cdwnLU%=OaKCOsrFeRT ze|4ia$l|nJwS~WnT&yINILvR&+%-d6;bb*?B~7tay!-6zW)&!Pr5A?f)f$W|{Gw7X zx$EM_oxVv9+abo$1d}zbKaAdE&XKb7fF}3$UBdXB=#;;-H`|K;y2 zh^EeQtDJuiT>BNjKBBiwl06lJ3x!nRDnWH;-)mKYA9CZw!CN`V%G^qu`9pun{LNu= zh78>_>k4>f4iN4khbbu5OT$1`#OxJr-d=VY1jn;=gWhOOpw8nTc$}kV8Tgefu_{#C z2dl%CJd^0RT(gJP6_#A#xwRbz)roL~C+x|sN={n4Ih;J_oIR|!1c$RIg`w`MG2Ng2 z$LTcwVxo5f<8M+~UcB{&e#B({qN2L9T7<`TWvLdSq2N16yn{m!6p^PZWYq~yq5)Dn zT$@;|-lH-Cqm_^z!B{MONQ$)m3v}NE6=~ 58R1LWcX(AE~wu|hkPbo+nu3o-$Lt!m*~Bg zV38l}|17K_om}W*`*g>H9*=Fa_(cn{#cG34dcHw&VXfln^xap4cR0)4JT5k-o3o)V z(Y4Igx?vI-D|4z-?-2EkE{fqFn;v=E@|X1YsQBmU;GK)fj3wUdts_o=91_TK`-X2i zlY1G0pGou`HDQJ+aJV5dR9V`9rCBO#Ll`Hj+P#E*hux>>+7*UB6ymQiLTufQ8D!kq zd!r 2Q1_MzC2N|4dThE z8V(L?uH{7$47#9dDyg|aqe2VrX$PV=P|3f+l<|BVh)y4`>Ki=b_9T Vs zr%@5?^rH0VGQMUnmOtZm5d_ZPo}zMnj}q!w-^yn(0;2-A(%o~vV%QYBljJ#=3gC$( zG8L$Tn6 GHxRR^fGUsI=+0O_A$TX?hWTSKLC4-3i%5&^oxnSgluLu+ zUuEyy*D#PnUpfxi8kT+FFw;Qm$XrrPFg^Ld&>L$ul6(e2er*0kB^`_iPy7oCqE+?G z>zRVhvvCzH&XKcTrFJA_gX0Fwnq8MC9Wv;qn9*q(N_Y$m!Hgt_lPxO;bh6{}3|XXG z*{vCEKc#IycNh3YF$r29eE=zDQT8gvIv pc=IDeQ`oEC zr*zl60Y2S(sqBGCP=fu-5VxxORv7Tu7O)o2GB)LWppg7xa8ogdo1UstwOUK1zVvVF zBK|P*PwuP5n7Z=vvRb&mSQJl4)CAh28Y$n86oNK=Sw+1|LxA^RC{v=$)LSuAQilmV zuR7 M75~#Hst|_cLQlk(zr$B@>kDJFa^o) z{6jJ*IR<$C3=Ay zPsX7%*$fm~t(IejlzeiV?mEeCi+QDUYi?*zw(Xq5y}t2vvR2<;pFF){=vL3| zZ5!G>J$|w8i0Rm_LhMpMdpzU%=J?j^08+^TUOr&HkBGjUV`nL7EUcSS9-_#;nk_?~ zuwEQp6Lolpc7r0HCCO+Z&W9s3)u#HugNCN4->~$83aH?SP4zC+&$TZ-zWUPR+N XAK#BWFeDs)@T0Lpv*#p@>HI(f=m0_S zE!E@A6+Q1yPz3=Eypo7SF@3}tQ*|!QR0Lp}!k_w|ZI~h$ bM6 zD3Xh4lRl8 FHyR7UQbf7{=lKu+eLx)Y46LXqP zK3NH}wZaGV83oAKQZM3}IP`q;dhA>ZB}C@o7Gm)4qeO84ytUd$HEOz?{ZT}IqaqT^ z;k;tab^{Er4r}sGQcImBela18aIVf$w%7A;w9_Tb(FxO4NqU3TmOT!QO14h2SD&R{ zw&D3uPdKAt=e@kA+2LA|wR_{m`S@#m#iT8p)~dKIUIVsgZ_WC-6;3hv2b7O8xj`F4 zb@Lmo?Zxk^Q @BGVZ4^OehalI$AC |Ps%ccoxhkIh10bnu rpq@uFFWHN==NwNSc z7Ws^`ED~Xo@9Q!oI%p6UV-l%sIj6lCI|!gx;u}#r9OMp)=OU$`H+3@;hV}wrz@mY- z0YOIhiss^WI^V5t!{M+lcN0m5K+I(#eJ4(&U1vmv5g4Dr(3H^FOQ gKE2PHhWe;tF;@znqxdl1CJXG2W#QQn|7~=4(1**s(SPQ%77TbL zOmLT>2}jyTcesAixhc6|12=NiN-V7i#^(Yj#0U~Q{r69!*pY@hGBUFAq07BsVxo`a zHu9Of%?uA6y)<@;1q3_FyIB;IMvm4L{y~YAHhBNggmrP`O|Ikd0(_k4T&3F7#Np-U zp%Fvm+&|sr?Ph`QFBlgbnwT0&weazhyeL_w%EF~jo = zdccB7-QD;!q`jC6ETOO`n|Nd%bT#rJ2ejVTf}rp61lq|+2R7oaAYsUU z?bdIpq6NJmuZ~}s;s1u(cd0qZ|5CeHIW4;XR!?78-0ZBV(xBIG;y!3SmGYWEim%*T zG#5@+R8~$x$+^YTQ2$cfRsl`vbBE(hBEiGr|m+U4`Rq?ak;?!0CV9Yb!yvuAQx5 zY8HI0Enz~mzU(zrQ}JRuxv*!PpmVeDoH74mwoF|sO1pm)JB*;SwLEu1bA5I%q-9g0 zX`UaNf>jL%h%?_YKQpn>a5C!6RaI4Gg*r=vl8JRm9wnFR!bq5V>+|z7Ruv5JpP|E} zkP*lq515g6I2cEz#@+zqGfT-sn~k_#g4H!PGTmT~vDp1Jvu@GpIVZoKdddvI`x7C> zN%(gB1JkQ`^Xcn{>cM9P_lUytE%-e-agp@XM_wo zfqE6HSNPD*#_5@*Ytm8icuk_bBm0Dx((K)8@7beqh?`#YT)`EQnY}@_|3{omW2}_q zdpau{DP=mFu;WB-%=sWbz<5kX{3AYcU9OKlzFR^=0GOV &pp#TUs`dWXsN+Oz zL8OQMm>wQluzaQ+JdqdNQBakPFuqWxu6xO-bGy4jiJsT(NO7$nmPw1#7~T>Jg_LG1 zPRihoLL1|bzU+~C#SjEjNJ*)v>zzvd#1r$A)U$IH_+1070d$ZNhk-6nDeGZDMWx|E zNwJdKIU(RFY1%D32&%_UP;xA*nnse|S3ry)Xnsv|Z|CnSmF3%6Z>EmAwr`|Q5#K{T zpMW^o6M1kEl)AHBRp}`bpNL?4+u!QM)XYvbGi{W`i2M5v^vww!VOXC(QV$W|cFS}0 zA-o* BzP8`chS+|Efi8ivaAD-V-faVHDKRP{457_^eac6zb;#-n zW^nylymjuJ<1p4_WwhD_I9r#=O=Bpitq<*Dh|$3D%gD?9ksdN&fHl43k6meOH??pJ z`!WH#h2=&_Bj23I#vIjT-KG^oa*lQbFp)mj^K#TB>`C9cT!mK~M%4 RN`+?MAuhIk@h-yzmWyN z@7OSu!GoV$QnjH=T}`vRR|(xMm%YU9+vD0kE&__ER!lFQ UeI)T7n=lEM&&!%$PK*v^$brRh^5Aw5w2uvB0Fkf>@^SfUay- z#}-V)LoRuv?d_3qu!v$ceI1M9GBsxR!Ecb-4HReRED24ciRC0DNMk9&@FKEj7fp`J zUOJ=@09J1okaX*b{S_%Dot*P5B)((lbh~AD^&X+1R!n21>HQ6_Rui85_;Si_RUkTD z egF* zN5UgzLaJvNkT9Bfn3%uhS8|TTM(5vjJ$KJ+x}7xB1cjzFz0Vi`SNvD}M88~fpgv*# z=PvWsP{alX@kikn`QH-5&yV6q*uGGif=l2-sK$-ty*(UqBXpY+YNz70CO|gS_(qa1 zU~V3{ylUQ3QwyvT*6n@yHOzXuOO)nze@vrHpSUlZ53wNb>tfPvoBESfu*22q^Zv0W zY08;3{o3I=9CNs!v~s3+_w{givT|on+Qm4*ndOMK=$wE5v^69%@;*qaNFR0enmVE_ z^pfck!FEXoRgFg8KT|q;>@*gi_jUUTp>1eX%Ii$TC?V=Jbk#Y2dZ7CJ=VgiU0`b$s zjfKoh96`~qkx=JPn=Z^_{7Ons66UGK8DTc;Bi4AXbV0~^sHu`;$Bz{Y+QPdATDxVZ zrP@3h3P(=>U=8BYeehCT=8eM5MS0CHg8Ef(TUE1n*pt_dMED4_YSXe+wRN E7tq> 01r8Pd#}0qv9@ zFSy6LnUYJA3yDA~iG({dfLV?R4`+f>No@cdJ(;o2YUj>tP0>X6$rxaf%^V&2ODLA_ zM_%y4a%a um z&ofO23FoE+IKS{brXECDkeF{o@$99>mHT+j*ynCwv5CMJ1Oe&y*y2M{8|teMHb7pc zRsZ(IR2R&Jz|gD*t)k3fKqCy8!U?SV!(R6vt!E*nP0rLt@9+tMg*!vd24KNNop)8M zb#rm#D%fPoRXihknXNy?^e85utjL@$__<+qwcZp>F1jhIcF99Pvk?lqD{2iLxs-gL zA}JTrGPqi8HoxqUqzWxQjb;$R;9*Ek`Dxj(2H31&TTS|)r4o+T`Ir{?SkwAsg_Z~F zrA(wEhvJ9&kr6FbSC&gC0U^co_^Y}%R3d~%^co7Wq!R$8aXhXHZ?nM_t_ZfgJRD!} z#~8B5Fa^$_NsJ_F0Epbm<*Tf6MipyOm2H{=K*<%XYBFk8ozrO jbvxC2SI>0!<+y!;9qyESJhJI+v9qvss`#-I3|LqH3%`gP| zS>nt8wOp{O3M~Hra>)Hi3@%?Ypdh{WUPDaq?7s-u6;I=mD47UJSJD|K C~LuPdtx2>)w1mzu~>&z5eGK zL(uc-c<6QfgiLrvS)C^{-OBKzZwg)FaWMb`K1hIkchLa7eP=sA-Z!@ZAYWr-KyErP zK+7Sf;VcjsaMA6to=!S5qM}GYNEtDDmD|)Ex$UZ! !h@V{F0!^C?d~+EcF6e{FSBteIR93Wqa&RO3J8|3B8|Bo0FH;b6U?F zkDDn*zQUlqG7oR{p1?tSkKXv@^Wq>ch$t`fSgB{hWd2M|C1d*qOe67_lif3!_;5Xf zg$qLZtm8{ml&95f@X?ZN%-ehoZh>fw?$cQ@FHPNs5y>1CpZ;aziF~7MHj$5o(RZ?y z#pTn|N=;K|s2{u>K9v~elFa!z>W6Qmjiz2`3rX?3{lTySETUMs@YL3Ebt6L<+zN`} z57v^~u-Z*~_KY#3pnI0JH8{!m$J-=U`WarQPRw_k-4vT9o(lSaz@(=mb4#UzhhCwR z^fN@RQ&3*55Zb~5^D a(?U(@wu7T1?w@=;3 A#i; o0 zw@~nw#^?^9M?6P_C>N@+G!M{6$1S+s`D zJcNp*F;%DCgfO{YzFv;p z$Y8Om--77%l)k#XojPkNn7`rXR4dD7)Q_3=x?LYGlwu|Gitda#{8P|utoj|fDf~sB znauup`JtAVr`0u;Jo=X+bU Cnt#!o)2=p4)2cFqcXvBo?a(k0 zPM%gG%xY{nzk_x4EZx)D q261VoA{+Z{VVqyJP{RN{CFc zw }4TtQK5wo1Q2Z(sH+5 & zfQ~>7_o}UJ+yLb#K|paiI C(1rVI)#jU_M5c0lLN %fv=(zX)JV&%@7 VJZgK7uUt`dOr_Ds^_T5BI>gISj ziI5g%Dww?ZHB5XN8`~R=YCE*5qU6mAG>6ZQKbs!wu+g@q##{5EYC=bd=ij;`CVVi< zF1TpoC~Bu#bRe20EX&ncGCQ^`3K+;;DMqMubVdD5P6$(SfVfxPg=>G9H}EN*Hh5ec zG*szDBLz&cOI^mLxZ~w;pllB;<(PWcC*dpc^*LCp*@tmOIHD%xo43 v37U^Kqt1aVl{aH>9;teiYZh@UDA3 =xJU(OvLF%=)v=Y`RZlaGp`ww+9(Z1=pwp!WjmDu&p ^>7G8CRv7Ez7zmfIM{?yAoQinc;3LBznmz$xE2r?hRkEPM`~Iu?pay zrylXTcrr4nQLEgE9u-DXEId@bteoJUkFNMn1{xUPpj=1L6cD+%E#aEx_bm(J=e2x7 z$pu;ZjxP5$LuVCNR1m(s-EK{=%<;~>q8BVlT|B~yIcXS4s-YjAN=Vd$^?IiH*Re3W zgc5=?>Iz0J^7Z9lR8EQ%+u;0@$XtRQ>Wc_Sd(TY@R7k9*nT~iJ`LqmZyxz`CYltH~ zjgjGyeRSzl{3s5>7MG(fmbZu{WXDc~2u4pEPQdW)IVo!yno3knxU|dn4qcq ;pXP-@9F%rX+1)IeSW~-KZ{_{EDw>`0!(@Jr#h3sE^2o(VqwiOlxa)D$*wb ze?MRtA3FDkppiKK+H(fo`$yT$HM$-T>Z=Lz-()3?ji_3_!TEK(Tq82X4iWk$$W^;p z^ZTK{-xuXzk|A<=P9|AWCKxkRsdBo0U|sVGy0oC!xLeVnz-jxGfT2;H&3fq_uQ#?f z`CWCm?qYt3ILE`D8_hes^-n%*)%}yo$%xu5@}lw^dXa*skd>T<+#ILP3ljd;uVuUW zI^~m5s*d_>LBJr
_|A K==NNZuqviG=BH4);_R1!1oi`v=N6c>r@3>J=&J3<8m)(+wHX%3u@}(#Gx#D zJ%pt`gGOXlC*gwn#*O8jtmSLUxB^*nlNB6gEcNRx0z+p6jepEd$su#fEPeaZRwR^& z#wmRXJMtWFg{q9y+{ysL@ }M|H@76J5u|xVz?uxqWP5>ST-XZ(lY_h z9hHN+Man33w{Gb?3nzW}Ac^r7FWm{gD#6vgZFOw+$dPA~4W6s=&+xvgRgF-&n~_25 zuZR#9%tZy+*5aH&)~PE&?9*
uFq$9=ui>q_& z5+qu(XxX-H+qP|+UFx!J+qP|X*|u%lH8r2!%=-tKYemG(n{m!QJ~Q*2a+ogZ17jg& zhBu|#QIZq?n)p+d8Xa4HlscHX&Ze_0!duk*+#)@-T4d*dAlnhcP33?K3Gig$4>Nhe zlQYd6LIPv8;*_pwq8#qUnpkRocsQLtJnR`TQ4@G6^))Y+lYG|(|Cyf- !=t|2V`0iV8>?j@g-i{5Q;<(%`-G5w^clz2oKPIpw9Gl!AX^U|r%9RFy zWMI}cK9|`*B0BR8U3+0EA*XS^u00|@#I)uh30VP)Q|UQkG_AKP&6)fm5PAyXYnf9B z*-m{xLbBcN-I2?>)m6^1xd&~BIca&T!BsNGuYh-+hEs0sL*w@wFDvH2O+oe!I7_{q z#nVlkdj}b&>U4B$$9c@^x7l@kriSc%btEZ9_KX)(1|+xb4{3Ox2q?lN0}C(N_m(KX z(A}if9V-DT{k*m?*ufO%hhji^K!6UAL|b(t=itF$FC!F3#oH3*NAO4{qNzR>%ee3) z&zBZpk@s +ccr 4cp!7?#;))J;0o`66(jI z)D!`>?uXac14cLOT_RMI9cUC&As^Yc+q?F esPFZAEufX^Se-voF70C430-p{f8*M3g* zmsZYz!Uhu-nT8<{Mo5JeK t_AC9(sy@>!#q-gPu^W-CDX3E?9<9O*nTpk}30H@cddSj*1czYo9@g^{E zNAK*&?^3@TWZReLLDP=Lqk0E;_l*-kuM1?Cd-j4Hpakpbh!Nlw7J$6b75_R&%Ymfx zSpvxZGRPg?uk}XGa!uXmCf{SV)4yEeoCFP6EtedVL7rpeo!Kx# 7s(|frr(hFpZ z03t7tK&Yjq?#QQNbW`qVEtf<(hc1!jBz>Q#c`^rPP^H Wk2(lDg33T#M#P7mI7!r}am^yc zURLMoe2z^$mP&UB1zt1<0rf5@3S)9!5kh(|!gP+DY!Oj@tcdz_@p0+Nwg~kpZNzOC zQ3@D+jpg>`&&-DPI^Y8s8>wur0=dPY1bBV4*}@VlUGnHlYD6+-*F+B5JnT@Aw%M2j zUHVzqudUR>^i7>n6x^6H#7gY1i$jq-k}eCZ$(9~l?9!RWr~~hXSFAz~)?P4z8h|TD zTC^q>CenuG+GuAe76vE=;l|oP408Xx6*#1PF%hL{WYh!y^edNFD7;W4UI{00#1NR4 z6gxAVZ^>sb6)0|^)8IY?TA$J_e8tM&cy0_fug njId#g)tl_^hwLdl{7q_zK$s2no_&zigu@j#7;5jF3Un%AvNia4mTN{nx zl_!Q_3OIRbZ*mLTT 2n z>dT^aH77%1z(YAOWY4IQ;u+2|#=JaPcu#Xq)Xx*5wMTV`bR16;?4EQs-*T@tWVUTb zYM9_2G^H?=ITn^KuJe-Ph<}pvG4l2OnSJBXv-8&T@WBZN3i{cL{;od9|MB(vG1=e9 zy$D|ez3@)2@i-IsmMR+%`5k E+BlPUPNNhgj z;$d7}0Lj$;5)~_NIR;-Yhe{&Mx#O+$RMv{#ijmI?YGm}{tb@p!ka5?bq=b%7^_nq{ zQ(m@mLZ4#gqUB%q0s*r~=pBhN#A8F{t!Ns`U(clG?* D(@+3@Qrd8Ea9;%vHfdG7p>@j% z_4+lH$clq78>Eh>iuOhIVt-pUC&tsVZRF7oGiOXr3bT*u6cq<%({ug-ll#);taQd| zNEvmiuj(f-l*GEe9vL)SwFcP;kdT>&-6OVUHXZ?qT40Iawda_`4tHD&h3SrcHN}aJ zZj^pq(Od|b1 xK-!kJB~UX`e|COfhm} Rz`cXqTw^A(-|EO*7KX;4G7 z%^3AhP^wgarmuEPJMzBLu#c)WB4u4p-_Mr}A{*bNg>ue{Y~U;KF=!Fj_fmUxS!jYd zg|RQn)fdXYOd=N)9cXP`26WV%W^yx-Hk0}s=K}}bzVFhPKHyBl#O~?L*p*R#k4-^~ zdY+OAR#5W@BzQ4YYoD|+)@MAHrbkx8KPAMfiLvXbyjoa}JNVs^%F?U2FXX^A_n48` zp;QG_w6pqB=F8h(8>M?Nt%C3={Y0kZ VUW7r=sFi`rwE3L2~ID2ypq;~BOE 45~u3G~E3L2PYPbdVzm{SWvo9scO4(hJg ge$oxa+Z)wTm *Y$8OrKaN&QVyTw0e&Iu500O}+W%Z74EBp=x}a@p^u( z*+~VE=4B%0-_XLH;r;y98fGiu8nX-Ck8&(BWBpM61g`M5D%WQ2R`)hn>1kT=V?`{* z_ZS2~G(;NsSg249!Q`Coc*+^mBzu%j01opRGBd$^Ucs?q?4qOitiS#qEJ^RyZ_wCd zrR;xiPyq9doTPDv>6g9Vm;U%FexX)I_bf#pxdh(y?RJJbM@0*T5Mms*> zPZNMUZR)xuw%!uN0Q!pPNP1kMlGU1}dfIv5^E91QY2t)+DA<^7&^nw*=?Z?s*4xre zegm2UI-wGQwi?2=7U6L%HE{7CHo_pbH~atuPd64H%hgu|`WX(k{0TevEUJ}xHTOu` z7Fl7XO4{@QL$O `*=YB8K?IU5DuY!0~pl0HKRc$>Hbu z{UP@aAydG+Uu7Mi8&5Ht8TeQJx(H7C3DeXKFQ$3`D#jK25U%2%(R`@)3_^rL0!&j@ z(iYVrSmtjW6tjd9+D$5VA55T(Gc|Xx$QH1|z2OKxVUCXmp2(yQ5X<@wa{vGsdXNVA z%e% z#Z3420i2y>-#InM-P2WGpmJ8K039sM$Ho&|H} Hb Xh~noN^#1ba z61nCet8+E2M*S`n6=k8^M6An&(5VjIvGMd^NrjTYZL%g?dSch}36vWtii7!aE6v4o zR{!)Bq~wT2&AVL((un?WKFKTmy~Ww{5!Vd!zEl^gpTC^-4TBYRvAhz1C8bo{M;G#J z8Lg?x(- nnTm#R46mbRWT-OJ3Ra!WfYG|~Y#n>B%wVz- zyJu3~JW7p-OugS1!}B4h5uF<5o-3>_6csZJ+d@ni1G(tliO}N8C5P79IcvrMwnQ7* zVhj0ND`q``dpbU!&XoA-QPE(+pMrDh*q*|T@H7qi@N1ugn9+W|G}}ER8w?w%iVZ?m ziJ~j%OePLs(T-D1=8}N5G1yb9UtrTiW3yjL0HKv$M3n7G-qS9+d1;mFjxoyiaHY7J zxES=5?8IwAll#4J$6G6zyQWkf{mZAQW?9OIU1848DX3-j&bhFQDSg)A$AcCH *fGx>JeY2kUzA9UIyJ5%*E?+R{tw#!+0pG!sO&uxO7 zAmdnXwUCtj3PkeC){h =n7#B-prrf(v&?*{mYY@4wn-tRzmS;@;%h)~RAz?SwyHH!c(( z8~TeIhmxgOP10x_QmvR@m1sr{MH8 tSero%tenyq=SY&?DQ?YneA9)th-AxDqWu z>-PfxPlHXEHfoVn;Yn!`0RU7*0RTY$r@^coCvi6ZUa;JD>l4BZtRieCal=yD=LN%o z!!7*9JZ`ej(vakFzBJ(Owjbr5>AFSq0 7k&jh+G?LZu7bW|JZB)di&ed8Va$5B9MCxsW@IC)!^ IzHQW6?i $rd@aeHfy*?UQO)$P O%)&3LU=NyT$q8Wky{9< y7k8^9nn~Y(^of}P;Ggv~%Rb;n7uM6cZA4iZ|e_{Ppm|v(=6;z%( zwcqCf{mf1;3SI%FNY48az)}-Pu^5|o^h3dI%*-@iHZByr&qXsBlzst>E>Z0t;`=2} z^V}St_q`Ysy)Cih$Av_3?s+#G>}dEHe6M tMHpNWG;@Yw0tK)Qw~EmRBL z_a`&>pRLO)S#;5!Bty+3P=eqiT{hU0hWlz8{4lK}FWAti_-60>)4+v9WtII#uLe5m ziTp4U=?W65#G7O$Xz^r>8Wdxrv+jbh>;9smUNa(WI)oX1`8Zr-L#jsiW(08~H~7Va zJ=3 $H;F&%3FR!NJy7_nFnl5H(+xV3)}#6 zp;G-?Il%K>gfM&`1iPMnBmWD{2{b&>^arUL2y+ZP1|?jfrd$Vcx90H!&A?2-pMEoh z6c;TFpbluyuc@Dhekga~kFJ4!l)Ub`)(~%K c6i(2L`EMY3VYmS7NWn{Pkt;FU8^S zkH_hHwb3$ 3oYy&6M^A>^A;;o)+UYK_;h zgOyx I zVJw9)LkhuawDX!EZ#gn&E@X*xrYOjq+>OH84g`@ms@+=V?DIP)*P0bGgP1q_mxi*Y z#hm{BVVK%ww#}f~-s9966`;Vjn(i0XLJ#CwKdx0BZho$SEhs#tmeq0&24~4z4R8$s zg9o%?hqFIcLjYSs!Jr|fu05v_b%T_}vO=nf$2(S}VJfY$t|~9AxY(Sa>mwUkXK;7D z`3EawwmKjy{p)*`nQEX;wpG~FDU)hVIC^gir2r-x<1>1?W_Mk3SZyS!HlX`qLpUII zz^<4jSD0KcbOY@4Wi;vSN FTKRP$8M63Y!PZK>K9Y zCP4`kQoA53RHbmHzV<6B2cpgo%)qeQVSnAbc>0heO>Odh4Q#cqDwa0@Onu1km 4K5&I15QS#28e-Cd)5qS9gkBxJ5oW0(i{78=(sF;;MsY7hBI{gmJm)CC^ap#7 z{{ ubdHPB&8YjcSlfeVy6c> z=$J65x!QMw^4l1ggEw~tE5kecVw--rWUwwMS^Ua-CF-40RQQpWQJ26GSr5p+!VlT_>rz }Z;54EL32ecWPW$p!o!%$g7lE$lj0RG)0q~ZvGp|AUIGq0 z812;)GX)JrfJ(JRi>!O?Rayn?1)3yU{iSu<3lL@yZs_ZQhNO1XI#g?cQ;Hf#mCw(GakwgH6hIei(4HeWZ|p4w+Y ztOG9E2fXV`A+AIdkE=|QVX^}zMz}6xDdlnCXs>=s@g;^_B@pmXW%W{Yi2UJ95{^!8 z1}Vu%hOlM#462@CTEQxFS1MLLYhdd^wp55kd`TQ^;wEU?=8*mA6#CB7z$acVY0>*> zGzW%C0RwTtcVIcXrxxT*VGSI~x&QnyTBE22VM2cG?uk#|?iLPP$a|x5%nq~LmQo2? zCrKk5_jWRxQtr*B(~cPHHd4<)afZAZNpbB80jXoycVit92vc3pU&TJkMndaH=r&Xy zi@R}v_~HwoiH1~HegDEzY{gVnNfMn&rDK7?X?wtG1o@&|5X+J6R642if3_Y2K|q15QO}&vCG~ns=zbEX_%3bRVtr zeC &I@oOO4v(!r_rhzckg>uqx$ z@}<>BK0X)EX5mL|Hq2F^hKK7JLxjQk=pixEF=<|2YwX%e6=j_7-hBwKLUX^|yg93C z6}He);q>?yW0@7SMAw@u`B1)IAgZT^>Bdf>U2?{i5?3uqU!)~ZqNjf!u IZmtJb?9lbL25-SeUE0!YNH!%TdOtz%Vgt?qmxN_>!8U UO zRRRUOKJE(7DL)a>>{Qv#(oy9W&sO)eC}2wzMp&(%Xp5v$tBP1~{+wirfakim7LrxG zcV*FKMR${#R(0RA%M^_!L(-HX0dueO&Al=Y%t n^xIGpkSy^Z`AdExv)VXTA8P-hy)OQ|z*g=NA z&a%pljs&@*st)ukLI4dno*h}lYBdf1gZ+L>LVw0?&K_`=k_$5671fG6z%cWx4%EAg z{y2SBYoVO{R*XOBRMVs}AEz`BgN=i_0hovEMt|z++Cl<;vh+UWhZ6V*Z|_m_9MI$o z^MdQ%@V&psgav$+MzUHb&gqiH_qR;i$0McOW_Xv_Q=!5fAwPpJKO-AMdrHS-Cg!2p zwk5i{YZcN_xcW)(JX3-||3&f6CJIaJ-!GYobi%{Gg6I5oMg$eV>6~b|vnM+CKs6HdmSBJ0C(7^)C@RA{PNVe{pW!t<+6I{MTP-m8#Z!f208nL7xso%F^qY0;4|Bg? zrMAAHTJZO9rt!TWjO4nEFr6%m(_hCJ%T?&A`EF(Vweu+=0~9C0LrinOf1S_?iH&~3 zL^wQ}G_@XG3P(jp2%W2MW>2Wd?KR&7cST3 _SYjvo z b#q% 74|Fp*OJy-`F=)43xj?H# z8KOy@WTr)=b)reX!dJM4Mh@-NCB8wyb7(xkbk6FtCG1H;Sva@(AU(u#Vkt~HvObd3 zd+;89dd#eTq6_E9%)k+2E}Oz`J_VWA!o ;2c zIFgQEl_`^ezyuIkU9WoKR$G?87n!?{>4PO7@qs6tZrA1ap~lO#1#u~NeLu`!)aitR zDhW~`w{x^mXfcz`LQ#!KVTjyTX%}uroNj$-*PWml@QNcxwP z--urDq<7CX(nC;m^cmjR;K5-Rb{ hi|0eBx_Xymq{s|STH z>ajQA^5~&L&mM_BqpEKgU+2j^f4@u5ak^?1E5Pau3KftPeSZRPyB+9R1Ped80y*cv z0I?X5*5$YU8dJ$t`BO17(`B90K=Wdaki@4V74=VeFac |wAvW6UD14+~k)?eumc?Eq zJ7AA~C0%Um>Gq-fHxu%n8NDkI;8|7KrujwZXh0JjIIDpyS3vfh>p3${oVM?;y0_Q= zu;Go3Yn!WMmMyfB;xS@d$rLzO*a>*_Of~+H f|3Y9u+0e&HNsOQ{Hi24|B4Z+2YCnY5=qLR`s6IjLPRaqz3yY_W+yuAesG^t`< zK!PW+m;dzZNQdP%6iu8rov1pIGP6?pu0b5iEEkqqCfcCP9rL;p8MKa$!vedsdJnt+ zSrzZG*56{OzYLP}7q0LSpU7{RWbe&4I-gQqKCI{6G~k*?eZBlxfO?<~bK9I*xPfA< z ryin>q;9qAMH23KlaRiV zOL65k+G5PU#uQLU5m81Qjy-miwO?ash(Pdk(v`BmE7>;`Ay=As_%H~mGTb5{oGQ^q z_#ibSWpOn_g(ZLX*-{a1ZSJwiQ&s0|uSUV|pmEmU=Qbf8 L-qc@8qWb7GOVuTqzf;;_l?~er zI4;B)i=xNMgOTI~vh>K!tqs32Xh9QdNE`^ sNm??(M!&T3XMdpi*E&ujAXAFnc zwQ)FV3`rDiCj^no)}7g__A{JpuG;Orv@9=tZcH)lO+4WgksZ__AE5S&hXTxU_toXc z5s*w~ReX&egR%C_l$W2r@1tu$`T|Jw_S!l8+J?_>I^KIbgu1CK3T~WHyU8=%#a80U zjBwe(#1jxAwE-95hQTmq?9yX~e)Fu<$d%zzoM%u0bgoa{U=5MLpp=ne#nHjC%wU8Y zlQk7qNGn5#^MPF&rZuC_VkcTBH=1DJDSq)>q7roab6|gBjP=*`_Fxw|bpxq0_3~Gt z_|MEac~dC)@z7ZNUU6a4`p)1~G;`P)x+|Z~TY&Gw7^wK<<8J?U3&kB%s>+{HB-otZ zvN0;6C}ky`qtUS1 #^+E)gjB%TXPzJNOnyF<>t+CEr zf%(REy29HxU}-@w^6FMBJ7yuV7w`uRo@K+OAAiYdYK(xNR=2PFmfcEOjODTjAehm1 zL&ilMPfz)M(qlNu87yspBc8(>Htr+xx=1y`S8yqLda_=aArrDo?~(|n`ZdN%EqDI{ zX^tvEwCYel0BT6O43)@bF-_Io0Cv%NHX0MA-3}!)GAIVx%=B82zBHqi(u%@hT$%BH zWXvnoQ)F