mirror of
https://github.com/SoPat712/videospeed.git
synced 2026-04-23 05:12:37 -04:00
Compare commits
6 Commits
v5.2.5.0-beta.1
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
cddf197a17
|
|||
|
904e657bb9
|
|||
|
bfe20a84dd
|
|||
|
46a8a62110
|
|||
|
eb64de6ea3
|
|||
|
eab6d10a19
|
@@ -1,8 +1,8 @@
|
||||
# Available for Firefox
|
||||
# Available for Firefox
|
||||
|
||||
[](https://addons.mozilla.org/firefox/addon/speeder/)
|
||||
|
||||
|
||||
# The science of accelerated playback
|
||||
## The science of accelerated playback
|
||||
|
||||
**TL;DR: faster playback translates to better engagement and retention.**
|
||||
|
||||
@@ -33,9 +33,11 @@ last point to listen to it a few more times.
|
||||
|
||||

|
||||
|
||||
#### *Install [Chrome](https://chrome.google.com/webstore/detail/video-speed-controller/nffaoalbilbmmfgbnbgppjihopabppdk) or [Firefox](https://addons.mozilla.org/en-us/firefox/addon/speeder/) Extension*
|
||||
## Using the extension
|
||||
|
||||
\*\* Once the extension is installed simply navigate to any page that offers
|
||||
[](https://addons.mozilla.org/firefox/addon/speeder/)
|
||||
|
||||
Once the extension is installed simply navigate to any page that offers
|
||||
HTML5 video ([example](https://www.youtube.com/watch?v=E9FxNzv1Tr8)), and you'll
|
||||
see a speed indicator in top left corner. Hover over the indicator to reveal the
|
||||
controls to accelerate, slowdown, and quickly rewind or advance the video. Or,
|
||||
@@ -65,21 +67,25 @@ listens both for lower and upper case values (i.e. you can use
|
||||
key. This is not a perfect solution, as some sites may listen to both, but works
|
||||
most of the time.
|
||||
|
||||
### FAQ
|
||||
## FAQ
|
||||
|
||||
**The video controls are not showing up?** This extension is only compatible
|
||||
### The video controls are not showing up?
|
||||
|
||||
This extension is only compatible
|
||||
with HTML5 video. If you don't see the controls showing up, chances are you are
|
||||
viewing a Flash video. If you want to confirm, try right-clicking on the video
|
||||
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.
|
||||
|
||||
**What is this fork all about?** This is a fork of
|
||||
[CodeBicycle's Video Speed Controller extension for Firefox](https://github.com/codebicycle/videospeed)
|
||||
### What is this fork all about?
|
||||
|
||||
This is a fork of
|
||||
[CodeBicycle's Video Speed Controller extension for Firefox](https://github.com/codebicycle/videospeed)
|
||||
which is a fork of [Igrigorik's Video Speed Controller extension for Chromium](https://github.com/igrigorik/videospeed).
|
||||
|
||||
The goal of this fork is fix bugs in the upstream code as well as add new features.
|
||||
|
||||
### License
|
||||
## License
|
||||
|
||||
(GPLv3) - Copyright (c) 2025 Josh Patra
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "Speeder",
|
||||
"short_name": "Speeder",
|
||||
"version": "5.2.5.0",
|
||||
"version": "5.2.7.0",
|
||||
"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",
|
||||
|
||||
@@ -343,6 +343,14 @@ label em {
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.shortcut-label em {
|
||||
display: block;
|
||||
margin-top: 4px;
|
||||
color: var(--muted);
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.customKey,
|
||||
.customValue {
|
||||
text-align: center;
|
||||
|
||||
+13
-3
@@ -96,7 +96,11 @@
|
||||
<section id="customs" class="settings-card">
|
||||
<div class="section-heading">
|
||||
<h3>Shortcuts</h3>
|
||||
<p class="section-intro">Backspace clears a shortcut. Escape disables it.</p>
|
||||
<p class="section-intro">
|
||||
Backspace clears a key. Escape disables optional shortcuts. If a site
|
||||
steals a shortcut, use a site rule with Override shortcuts (and
|
||||
per-key blocking) for that URL.
|
||||
</p>
|
||||
</div>
|
||||
<div class="shortcuts-grid">
|
||||
<div class="shortcut-row" id="display" data-action="display">
|
||||
@@ -132,7 +136,10 @@
|
||||
/>
|
||||
</div>
|
||||
<div class="shortcut-row" id="slower" data-action="slower">
|
||||
<div class="shortcut-label">Decrease speed</div>
|
||||
<div class="shortcut-label">
|
||||
Decrease speed
|
||||
<em>Required: Speeder needs a key for this action.</em>
|
||||
</div>
|
||||
<input
|
||||
class="customKey"
|
||||
type="text"
|
||||
@@ -146,7 +153,10 @@
|
||||
/>
|
||||
</div>
|
||||
<div class="shortcut-row" id="faster" data-action="faster">
|
||||
<div class="shortcut-label">Increase speed</div>
|
||||
<div class="shortcut-label">
|
||||
Increase speed
|
||||
<em>Required: Speeder needs a key for this action.</em>
|
||||
</div>
|
||||
<input
|
||||
class="customKey"
|
||||
type="text"
|
||||
|
||||
+1
-1
@@ -233,7 +233,7 @@ const actionLabels = {
|
||||
};
|
||||
|
||||
const speedBindingActions = ["slower", "faster", "fast", "softer", "louder"];
|
||||
const requiredShortcutActions = new Set(["display", "slower", "faster"]);
|
||||
const requiredShortcutActions = new Set(["slower", "faster"]);
|
||||
|
||||
function formatSpeedBindingDisplay(action, value) {
|
||||
if (!speedBindingActions.includes(action)) {
|
||||
|
||||
@@ -210,21 +210,63 @@ button:focus-visible {
|
||||
|
||||
.donate-split {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
}
|
||||
|
||||
.donate-split button {
|
||||
.donate-icon-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 32px;
|
||||
padding: 6px 4px;
|
||||
background: var(--panel);
|
||||
border: 1px solid var(--border-strong);
|
||||
color: var(--text);
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
transition: background 120ms ease, border-color 120ms ease;
|
||||
}
|
||||
|
||||
.donate-icon-btn:hover {
|
||||
background: #f8f9fb;
|
||||
border-color: #c5ccd5;
|
||||
}
|
||||
|
||||
.donate-icon-btn:active {
|
||||
background: #f1f3f5;
|
||||
}
|
||||
|
||||
.donate-icon-btn:focus-visible {
|
||||
outline: 2px solid rgba(17, 24, 39, 0.14);
|
||||
outline-offset: 2px;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.donate-icon-btn svg {
|
||||
display: block;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.donate-icon-btn--kofi img {
|
||||
display: block;
|
||||
height: 22px;
|
||||
width: auto;
|
||||
border-radius: 0;
|
||||
min-height: 28px;
|
||||
max-width: 40px;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.donate-split button:first-child {
|
||||
.donate-icon-btn:first-child {
|
||||
border-radius: 8px 0 0 8px;
|
||||
border-right: 0;
|
||||
border-right-width: 0;
|
||||
}
|
||||
|
||||
.donate-split button:last-child {
|
||||
.donate-icon-btn:nth-child(2) {
|
||||
border-radius: 0;
|
||||
border-right-width: 0;
|
||||
}
|
||||
|
||||
.donate-icon-btn:last-child {
|
||||
border-radius: 0 8px 8px 0;
|
||||
}
|
||||
|
||||
@@ -266,4 +308,13 @@ button:focus-visible {
|
||||
background: #dfe3e8;
|
||||
border-color: #dfe3e8;
|
||||
}
|
||||
|
||||
.donate-icon-btn:hover {
|
||||
background: #1f2226;
|
||||
border-color: #4a515a;
|
||||
}
|
||||
|
||||
.donate-icon-btn:active {
|
||||
background: #252a2f;
|
||||
}
|
||||
}
|
||||
|
||||
+61
-2
@@ -35,8 +35,67 @@
|
||||
<div id="donateWrap" class="donate-wrap">
|
||||
<button id="donate" class="secondary">Donate</button>
|
||||
<div id="donateOptions" class="donate-split hide">
|
||||
<button id="donateKofi" class="secondary">Ko-fi</button>
|
||||
<button id="donateGithub" class="secondary">Sponsors</button>
|
||||
<a
|
||||
id="donateGithub"
|
||||
class="donate-icon-btn donate-icon-btn--github"
|
||||
href="https://github.com/sponsors/SoPat712"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="Sponsor on GitHub (opens in new tab)"
|
||||
>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
width="22"
|
||||
height="22"
|
||||
aria-hidden="true"
|
||||
focusable="false"
|
||||
>
|
||||
<path
|
||||
fill="currentColor"
|
||||
d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
|
||||
/>
|
||||
</svg>
|
||||
</a>
|
||||
<a
|
||||
id="donateKofi"
|
||||
class="donate-icon-btn donate-icon-btn--kofi"
|
||||
href="https://ko-fi.com/joshpatra"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="Support on Ko-fi (opens in new tab)"
|
||||
>
|
||||
<img
|
||||
src="images/kofi_symbol.svg"
|
||||
width="28"
|
||||
height="22"
|
||||
alt=""
|
||||
decoding="async"
|
||||
/>
|
||||
</a>
|
||||
<a
|
||||
id="donateBmc"
|
||||
class="donate-icon-btn donate-icon-btn--bmc"
|
||||
href="https://buymeacoffee.com/treeman183"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="Support on Buy Me a Coffee (opens in new tab)"
|
||||
>
|
||||
<svg
|
||||
role="img"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
width="22"
|
||||
height="22"
|
||||
aria-hidden="true"
|
||||
focusable="false"
|
||||
>
|
||||
<path
|
||||
fill="currentColor"
|
||||
d="M20.216 6.415l-.132-.666c-.119-.598-.388-1.163-1.001-1.379-.197-.069-.42-.098-.57-.241-.152-.143-.196-.366-.231-.572-.065-.378-.125-.756-.192-1.133-.057-.325-.102-.69-.25-.987-.195-.4-.597-.634-.996-.788a5.723 5.723 0 00-.626-.194c-1-.263-2.05-.36-3.077-.416a25.834 25.834 0 00-3.7.062c-.915.083-1.88.184-2.75.5-.318.116-.646.256-.888.501-.297.302-.393.77-.177 1.146.154.267.415.456.692.58.36.162.737.284 1.123.366 1.075.238 2.189.331 3.287.37 1.218.05 2.437.01 3.65-.118.299-.033.598-.073.896-.119.352-.054.578-.513.474-.834-.124-.383-.457-.531-.834-.473-.466.074-.96.108-1.382.146-1.177.08-2.358.082-3.536.006a22.228 22.228 0 01-1.157-.107c-.086-.01-.18-.025-.258-.036-.243-.036-.484-.08-.724-.13-.111-.027-.111-.185 0-.212h.005c.277-.06.557-.108.838-.147h.002c.131-.009.263-.032.394-.048a25.076 25.076 0 013.426-.12c.674.019 1.347.067 2.017.144l.228.031c.267.04.533.088.798.145.392.085.895.113 1.07.542.055.137.08.288.111.431l.319 1.484a.237.237 0 01-.199.284h-.003c-.037.006-.075.01-.112.015a36.704 36.704 0 01-4.743.295 37.059 37.059 0 01-4.699-.304c-.14-.017-.293-.042-.417-.06-.326-.048-.649-.108-.973-.161-.393-.065-.768-.032-1.123.161-.29.16-.527.404-.675.701-.154.316-.199.66-.267 1-.069.34-.176.707-.135 1.056.087.753.613 1.365 1.37 1.502a39.69 39.69 0 0011.343.376.483.483 0 01.535.53l-.071.697-1.018 9.907c-.041.41-.047.832-.125 1.237-.122.637-.553 1.028-1.182 1.171-.577.131-1.165.2-1.756.205-.656.004-1.31-.025-1.966-.022-.699.004-1.556-.06-2.095-.58-.475-.458-.54-1.174-.605-1.793l-.731-7.013-.322-3.094c-.037-.351-.286-.695-.678-.678-.336.015-.718.3-.678.679l.228 2.185.949 9.112c.147 1.344 1.174 2.068 2.446 2.272.742.12 1.503.144 2.257.156.966.016 1.942.053 2.892-.122 1.408-.258 2.465-1.198 2.616-2.657.34-3.332.683-6.663 1.024-9.995l.215-2.087a.484.484 0 01.39-.426c.402-.078.787-.212 1.074-.518.455-.488.546-1.124.385-1.766zm-1.478.772c-.145.137-.363.201-.578.233-2.416.359-4.866.54-7.308.46-1.748-.06-3.477-.254-5.207-.498-.17-.024-.353-.055-.47-.18-.22-.236-.111-.71-.054-.995.052-.26.152-.609.463-.646.484-.057 1.046.148 1.526.22.577.088 1.156.159 1.737.212 2.48.226 5.002.19 7.472-.14.45-.06.899-.13 1.345-.21.399-.072.84-.206 1.08.206.166.281.188.657.162.974a.544.544 0 01-.169.364zm-6.159 3.9c-.862.37-1.84.788-3.109.788a5.884 5.884 0 01-1.569-.217l.877 9.004c.065.78.717 1.38 1.5 1.38 0 0 1.243.065 1.658.065.447 0 1.786-.065 1.786-.065.783 0 1.434-.6 1.499-1.38l.94-9.95a3.996 3.996 0 00-1.322-.238c-.826 0-1.491.284-2.26.613z"
|
||||
/>
|
||||
</svg>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -230,14 +230,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
document.querySelector("#donateOptions").classList.remove("hide");
|
||||
});
|
||||
|
||||
document.querySelector("#donateKofi").addEventListener("click", function () {
|
||||
window.open("https://ko-fi.com/joshpatra");
|
||||
});
|
||||
|
||||
document.querySelector("#donateGithub").addEventListener("click", function () {
|
||||
window.open("https://github.com/sponsors/SoPat712");
|
||||
});
|
||||
|
||||
document.querySelector("#enable").addEventListener("click", function () {
|
||||
toggleEnabled(true, settingsSavedReloadMessage);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,644 @@
|
||||
(function (global) {
|
||||
"use strict";
|
||||
|
||||
var SITE_RULES_DIFF_FORMAT = "defaults-diff-v1";
|
||||
var DEFAULT_BUTTONS = ["rewind", "slower", "faster", "advance", "display"];
|
||||
var SITE_RULE_OVERRIDE_KEYS = [
|
||||
"controllerLocation",
|
||||
"controllerMarginTop",
|
||||
"controllerMarginBottom",
|
||||
"startHidden",
|
||||
"hideWithControls",
|
||||
"hideWithControlsTimer",
|
||||
"rememberSpeed",
|
||||
"forceLastSavedSpeed",
|
||||
"audioBoolean",
|
||||
"controllerOpacity",
|
||||
"enableSubtitleNudge",
|
||||
"subtitleNudgeInterval",
|
||||
"controllerButtons",
|
||||
"showPopupControlBar",
|
||||
"popupControllerButtons",
|
||||
"shortcuts",
|
||||
"preferredSpeed"
|
||||
];
|
||||
var DIFFABLE_OPTION_KEYS = [
|
||||
"rememberSpeed",
|
||||
"forceLastSavedSpeed",
|
||||
"audioBoolean",
|
||||
"enabled",
|
||||
"startHidden",
|
||||
"hideWithControls",
|
||||
"hideWithControlsTimer",
|
||||
"controllerLocation",
|
||||
"controllerOpacity",
|
||||
"controllerMarginTop",
|
||||
"controllerMarginBottom",
|
||||
"keyBindings",
|
||||
"siteRules",
|
||||
"siteRulesMeta",
|
||||
"siteRulesFormat",
|
||||
"controllerButtons",
|
||||
"showPopupControlBar",
|
||||
"popupMatchHoverControls",
|
||||
"popupControllerButtons",
|
||||
"enableSubtitleNudge",
|
||||
"subtitleNudgeInterval",
|
||||
"subtitleNudgeAmount"
|
||||
];
|
||||
var MANAGED_SYNC_KEYS = DIFFABLE_OPTION_KEYS.concat([
|
||||
"hideWithYouTubeControls"
|
||||
]);
|
||||
|
||||
var DEFAULT_SETTINGS = {
|
||||
speed: 1.0,
|
||||
lastSpeed: 1.0,
|
||||
displayKeyCode: 86,
|
||||
rememberSpeed: false,
|
||||
audioBoolean: false,
|
||||
startHidden: false,
|
||||
hideWithYouTubeControls: false,
|
||||
hideWithControls: false,
|
||||
hideWithControlsTimer: 2.0,
|
||||
controllerLocation: "top-left",
|
||||
forceLastSavedSpeed: false,
|
||||
enabled: true,
|
||||
controllerOpacity: 0.3,
|
||||
controllerMarginTop: 0,
|
||||
controllerMarginRight: 0,
|
||||
controllerMarginBottom: 65,
|
||||
controllerMarginLeft: 0,
|
||||
keyBindings: [
|
||||
{
|
||||
action: "display",
|
||||
key: "V",
|
||||
keyCode: 86,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 0,
|
||||
force: false,
|
||||
predefined: true
|
||||
},
|
||||
{
|
||||
action: "move",
|
||||
key: "P",
|
||||
keyCode: 80,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 0,
|
||||
force: false,
|
||||
predefined: true
|
||||
},
|
||||
{
|
||||
action: "slower",
|
||||
key: "S",
|
||||
keyCode: 83,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 0.1,
|
||||
force: false,
|
||||
predefined: true
|
||||
},
|
||||
{
|
||||
action: "faster",
|
||||
key: "D",
|
||||
keyCode: 68,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 0.1,
|
||||
force: false,
|
||||
predefined: true
|
||||
},
|
||||
{
|
||||
action: "rewind",
|
||||
key: "Z",
|
||||
keyCode: 90,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 10,
|
||||
force: false,
|
||||
predefined: true
|
||||
},
|
||||
{
|
||||
action: "advance",
|
||||
key: "X",
|
||||
keyCode: 88,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 10,
|
||||
force: false,
|
||||
predefined: true
|
||||
},
|
||||
{
|
||||
action: "reset",
|
||||
key: "R",
|
||||
keyCode: 82,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 0,
|
||||
force: false,
|
||||
predefined: true
|
||||
},
|
||||
{
|
||||
action: "fast",
|
||||
key: "G",
|
||||
keyCode: 71,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 1.8,
|
||||
force: false,
|
||||
predefined: true
|
||||
},
|
||||
{
|
||||
action: "toggleSubtitleNudge",
|
||||
key: "N",
|
||||
keyCode: 78,
|
||||
code: null,
|
||||
disabled: false,
|
||||
value: 0,
|
||||
force: false,
|
||||
predefined: true
|
||||
}
|
||||
],
|
||||
siteRules: [
|
||||
{
|
||||
pattern: "/^https:\\/\\/(www\\.)?youtube\\.com\\/(?!shorts\\/).*/",
|
||||
enabled: true,
|
||||
enableSubtitleNudge: true,
|
||||
subtitleNudgeInterval: 50
|
||||
},
|
||||
{
|
||||
pattern: "/^https:\\/\\/(www\\.)?youtube\\.com\\/shorts\\/.*/",
|
||||
enabled: true,
|
||||
rememberSpeed: true,
|
||||
controllerMarginTop: 60,
|
||||
controllerMarginBottom: 85
|
||||
}
|
||||
],
|
||||
controllerButtons: DEFAULT_BUTTONS.slice(),
|
||||
showPopupControlBar: true,
|
||||
popupMatchHoverControls: true,
|
||||
popupControllerButtons: DEFAULT_BUTTONS.slice(),
|
||||
enableSubtitleNudge: false,
|
||||
subtitleNudgeInterval: 50,
|
||||
subtitleNudgeAmount: 0.001
|
||||
};
|
||||
|
||||
function clonePlainData(value) {
|
||||
if (value === undefined) {
|
||||
return undefined;
|
||||
}
|
||||
return JSON.parse(JSON.stringify(value));
|
||||
}
|
||||
|
||||
function hasOwn(obj, key) {
|
||||
return Boolean(obj) && Object.prototype.hasOwnProperty.call(obj, key);
|
||||
}
|
||||
|
||||
function isPlainObject(value) {
|
||||
return Boolean(value) && typeof value === "object" && !Array.isArray(value);
|
||||
}
|
||||
|
||||
function sortComparableValue(value) {
|
||||
if (Array.isArray(value)) {
|
||||
return value.map(sortComparableValue);
|
||||
}
|
||||
|
||||
if (isPlainObject(value)) {
|
||||
var sorted = {};
|
||||
Object.keys(value)
|
||||
.sort()
|
||||
.forEach(function (key) {
|
||||
if (value[key] === undefined) {
|
||||
return;
|
||||
}
|
||||
sorted[key] = sortComparableValue(value[key]);
|
||||
});
|
||||
return sorted;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
function areComparableValuesEqual(a, b) {
|
||||
return (
|
||||
JSON.stringify(sortComparableValue(a)) ===
|
||||
JSON.stringify(sortComparableValue(b))
|
||||
);
|
||||
}
|
||||
|
||||
function deepMergeDefaults(defaults, overrides) {
|
||||
if (Array.isArray(defaults)) {
|
||||
return Array.isArray(overrides)
|
||||
? clonePlainData(overrides)
|
||||
: clonePlainData(defaults);
|
||||
}
|
||||
|
||||
if (isPlainObject(defaults)) {
|
||||
var result = clonePlainData(defaults) || {};
|
||||
if (!isPlainObject(overrides)) {
|
||||
return result;
|
||||
}
|
||||
|
||||
Object.keys(overrides).forEach(function (key) {
|
||||
if (overrides[key] === undefined) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (hasOwn(defaults, key)) {
|
||||
result[key] = deepMergeDefaults(defaults[key], overrides[key]);
|
||||
} else {
|
||||
result[key] = clonePlainData(overrides[key]);
|
||||
}
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
return overrides === undefined
|
||||
? clonePlainData(defaults)
|
||||
: clonePlainData(overrides);
|
||||
}
|
||||
|
||||
function deepDiff(current, defaults) {
|
||||
if (current === undefined) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (Array.isArray(current)) {
|
||||
return areComparableValuesEqual(current, defaults)
|
||||
? undefined
|
||||
: clonePlainData(current);
|
||||
}
|
||||
|
||||
if (isPlainObject(current)) {
|
||||
var result = {};
|
||||
Object.keys(current).forEach(function (key) {
|
||||
var diff = deepDiff(current[key], defaults && defaults[key]);
|
||||
if (diff !== undefined) {
|
||||
result[key] = diff;
|
||||
}
|
||||
});
|
||||
return Object.keys(result).length > 0 ? result : undefined;
|
||||
}
|
||||
|
||||
return areComparableValuesEqual(current, defaults)
|
||||
? undefined
|
||||
: clonePlainData(current);
|
||||
}
|
||||
|
||||
function getDefaultSiteRules() {
|
||||
return clonePlainData(DEFAULT_SETTINGS.siteRules) || [];
|
||||
}
|
||||
|
||||
function getDefaultSiteRulesByPattern() {
|
||||
var map = Object.create(null);
|
||||
getDefaultSiteRules().forEach(function (rule) {
|
||||
if (!rule || typeof rule.pattern !== "string" || !rule.pattern) {
|
||||
return;
|
||||
}
|
||||
map[rule.pattern] = rule;
|
||||
});
|
||||
return map;
|
||||
}
|
||||
|
||||
function normalizeSiteRuleForDiff(rule, baseSettings) {
|
||||
if (!rule || typeof rule !== "object" || Array.isArray(rule)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var pattern = typeof rule.pattern === "string" ? rule.pattern.trim() : "";
|
||||
if (!pattern) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var normalized = { pattern: pattern };
|
||||
var baseEnabled = hasOwn(baseSettings, "enabled")
|
||||
? Boolean(baseSettings.enabled)
|
||||
: true;
|
||||
var ruleEnabled = hasOwn(rule, "enabled")
|
||||
? Boolean(rule.enabled)
|
||||
: hasOwn(rule, "disableExtension")
|
||||
? !Boolean(rule.disableExtension)
|
||||
: baseEnabled;
|
||||
|
||||
if (!areComparableValuesEqual(ruleEnabled, baseEnabled)) {
|
||||
normalized.enabled = ruleEnabled;
|
||||
}
|
||||
|
||||
SITE_RULE_OVERRIDE_KEYS.forEach(function (key) {
|
||||
var baseValue = clonePlainData(baseSettings[key]);
|
||||
var effectiveValue = hasOwn(rule, key)
|
||||
? clonePlainData(rule[key])
|
||||
: baseValue;
|
||||
|
||||
if (!areComparableValuesEqual(effectiveValue, baseValue)) {
|
||||
normalized[key] = effectiveValue;
|
||||
}
|
||||
});
|
||||
|
||||
Object.keys(rule).forEach(function (key) {
|
||||
if (
|
||||
key === "pattern" ||
|
||||
key === "enabled" ||
|
||||
key === "disableExtension" ||
|
||||
SITE_RULE_OVERRIDE_KEYS.indexOf(key) !== -1 ||
|
||||
rule[key] === undefined
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
normalized[key] = clonePlainData(rule[key]);
|
||||
});
|
||||
|
||||
return normalized;
|
||||
}
|
||||
|
||||
function compressSiteRules(siteRules, baseSettings) {
|
||||
if (!Array.isArray(siteRules)) {
|
||||
return {};
|
||||
}
|
||||
|
||||
var defaultRules = getDefaultSiteRules();
|
||||
var defaultRulesByPattern = getDefaultSiteRulesByPattern();
|
||||
var currentPatterns = new Set();
|
||||
var exportRules = [];
|
||||
|
||||
siteRules.forEach(function (rule) {
|
||||
if (!rule || typeof rule !== "object" || Array.isArray(rule)) {
|
||||
return;
|
||||
}
|
||||
|
||||
var pattern = typeof rule.pattern === "string" ? rule.pattern.trim() : "";
|
||||
if (pattern) {
|
||||
currentPatterns.add(pattern);
|
||||
}
|
||||
|
||||
var normalizedRule = normalizeSiteRuleForDiff(rule, baseSettings);
|
||||
if (!normalizedRule || Object.keys(normalizedRule).length === 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
var defaultRule = pattern ? defaultRulesByPattern[pattern] : null;
|
||||
var normalizedDefaultRule = defaultRule
|
||||
? normalizeSiteRuleForDiff(defaultRule, baseSettings)
|
||||
: null;
|
||||
if (normalizedDefaultRule) {
|
||||
if (areComparableValuesEqual(normalizedRule, normalizedDefaultRule)) {
|
||||
return;
|
||||
}
|
||||
|
||||
var defaultRuleDiff = deepDiff(normalizedRule, normalizedDefaultRule);
|
||||
if (defaultRuleDiff && Object.keys(defaultRuleDiff).length > 0) {
|
||||
defaultRuleDiff.pattern = pattern;
|
||||
exportRules.push(defaultRuleDiff);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
exportRules.push(normalizedRule);
|
||||
});
|
||||
|
||||
var removedDefaultPatterns = defaultRules
|
||||
.map(function (rule) {
|
||||
return rule && typeof rule.pattern === "string" ? rule.pattern : "";
|
||||
})
|
||||
.filter(function (pattern) {
|
||||
return pattern && !currentPatterns.has(pattern);
|
||||
});
|
||||
|
||||
var result = {};
|
||||
if (exportRules.length > 0) {
|
||||
result.siteRules = exportRules;
|
||||
result.siteRulesFormat = SITE_RULES_DIFF_FORMAT;
|
||||
}
|
||||
if (removedDefaultPatterns.length > 0) {
|
||||
result.siteRulesMeta = {
|
||||
removedDefaultPatterns: removedDefaultPatterns
|
||||
};
|
||||
result.siteRulesFormat = SITE_RULES_DIFF_FORMAT;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function expandSiteRules(siteRules, siteRulesMeta) {
|
||||
var defaultRules = getDefaultSiteRules();
|
||||
var defaultRulesByPattern = getDefaultSiteRulesByPattern();
|
||||
if (defaultRules.length === 0) {
|
||||
return Array.isArray(siteRules) ? clonePlainData(siteRules) : [];
|
||||
}
|
||||
|
||||
var removedDefaultPatterns = new Set(
|
||||
siteRulesMeta && Array.isArray(siteRulesMeta.removedDefaultPatterns)
|
||||
? siteRulesMeta.removedDefaultPatterns
|
||||
: []
|
||||
);
|
||||
var modifiedDefaultRules = Object.create(null);
|
||||
var customRules = [];
|
||||
|
||||
if (Array.isArray(siteRules)) {
|
||||
siteRules.forEach(function (rule) {
|
||||
if (!rule || typeof rule !== "object" || Array.isArray(rule)) {
|
||||
return;
|
||||
}
|
||||
|
||||
var pattern = typeof rule.pattern === "string" ? rule.pattern.trim() : "";
|
||||
if (
|
||||
pattern &&
|
||||
Object.prototype.hasOwnProperty.call(defaultRulesByPattern, pattern)
|
||||
) {
|
||||
modifiedDefaultRules[pattern] = clonePlainData(rule);
|
||||
return;
|
||||
}
|
||||
|
||||
customRules.push(clonePlainData(rule));
|
||||
});
|
||||
}
|
||||
|
||||
var mergedRules = [];
|
||||
|
||||
defaultRules.forEach(function (rule) {
|
||||
var pattern = rule && typeof rule.pattern === "string" ? rule.pattern : "";
|
||||
if (!pattern || removedDefaultPatterns.has(pattern)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (modifiedDefaultRules[pattern]) {
|
||||
mergedRules.push(
|
||||
Object.assign(
|
||||
{},
|
||||
clonePlainData(rule),
|
||||
clonePlainData(modifiedDefaultRules[pattern])
|
||||
)
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
mergedRules.push(clonePlainData(rule));
|
||||
});
|
||||
|
||||
customRules.forEach(function (rule) {
|
||||
mergedRules.push(rule);
|
||||
});
|
||||
|
||||
return mergedRules;
|
||||
}
|
||||
|
||||
function buildStoredSettingsDiff(currentSettings) {
|
||||
var defaults = clonePlainData(DEFAULT_SETTINGS);
|
||||
var normalized = deepMergeDefaults(defaults, currentSettings || {});
|
||||
var siteRuleData = compressSiteRules(normalized.siteRules, normalized);
|
||||
var diffDefaults = {};
|
||||
var diff = {};
|
||||
|
||||
delete normalized.siteRules;
|
||||
delete normalized.siteRulesMeta;
|
||||
delete normalized.siteRulesFormat;
|
||||
delete normalized.hideWithYouTubeControls;
|
||||
|
||||
if (siteRuleData.siteRules) {
|
||||
normalized.siteRules = siteRuleData.siteRules;
|
||||
}
|
||||
if (siteRuleData.siteRulesMeta) {
|
||||
normalized.siteRulesMeta = siteRuleData.siteRulesMeta;
|
||||
}
|
||||
if (siteRuleData.siteRulesFormat) {
|
||||
normalized.siteRulesFormat = siteRuleData.siteRulesFormat;
|
||||
}
|
||||
|
||||
DIFFABLE_OPTION_KEYS.forEach(function (key) {
|
||||
if (hasOwn(DEFAULT_SETTINGS, key)) {
|
||||
diffDefaults[key] = clonePlainData(DEFAULT_SETTINGS[key]);
|
||||
}
|
||||
if (!hasOwn(normalized, key)) {
|
||||
return;
|
||||
}
|
||||
var valueDiff = deepDiff(normalized[key], diffDefaults[key]);
|
||||
if (valueDiff !== undefined) {
|
||||
diff[key] = valueDiff;
|
||||
}
|
||||
});
|
||||
|
||||
return diff;
|
||||
}
|
||||
|
||||
function expandStoredSettings(storage) {
|
||||
var raw = clonePlainData(storage) || {};
|
||||
var expanded = deepMergeDefaults(DEFAULT_SETTINGS, raw);
|
||||
|
||||
if (
|
||||
!hasOwn(raw, "hideWithControls") &&
|
||||
hasOwn(raw, "hideWithYouTubeControls")
|
||||
) {
|
||||
expanded.hideWithControls = Boolean(raw.hideWithYouTubeControls);
|
||||
}
|
||||
expanded.hideWithYouTubeControls = expanded.hideWithControls;
|
||||
|
||||
if (raw.siteRulesFormat === SITE_RULES_DIFF_FORMAT) {
|
||||
expanded.siteRules = expandSiteRules(raw.siteRules, raw.siteRulesMeta);
|
||||
} else if (Array.isArray(raw.siteRules)) {
|
||||
expanded.siteRules = clonePlainData(raw.siteRules);
|
||||
} else {
|
||||
expanded.siteRules = getDefaultSiteRules();
|
||||
}
|
||||
|
||||
return expanded;
|
||||
}
|
||||
|
||||
function escapeStringRegExp(str) {
|
||||
var matcher = /[|\\{}()[\]^$+*?.]/g;
|
||||
return String(str).replace(matcher, "\\$&");
|
||||
}
|
||||
|
||||
function siteRuleMatchesUrl(rule, currentUrl) {
|
||||
if (!rule || !rule.pattern || !currentUrl) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var pattern = String(rule.pattern).trim();
|
||||
if (!pattern) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var regex;
|
||||
if (pattern.startsWith("/") && pattern.lastIndexOf("/") > 0) {
|
||||
try {
|
||||
var lastSlash = pattern.lastIndexOf("/");
|
||||
regex = new RegExp(
|
||||
pattern.substring(1, lastSlash),
|
||||
pattern.substring(lastSlash + 1)
|
||||
);
|
||||
} catch (_error) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
regex = new RegExp(escapeStringRegExp(pattern));
|
||||
}
|
||||
|
||||
return Boolean(regex && regex.test(currentUrl));
|
||||
}
|
||||
|
||||
function mergeMatchingSiteRules(currentUrl, siteRules) {
|
||||
if (!currentUrl || !Array.isArray(siteRules)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var matchedRules = [];
|
||||
for (var i = 0; i < siteRules.length; i++) {
|
||||
if (siteRuleMatchesUrl(siteRules[i], currentUrl)) {
|
||||
matchedRules.push(siteRules[i]);
|
||||
}
|
||||
}
|
||||
|
||||
if (!matchedRules.length) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var mergedRule = {};
|
||||
matchedRules.forEach(function (rule) {
|
||||
Object.keys(rule).forEach(function (key) {
|
||||
var value = rule[key];
|
||||
if (Array.isArray(value)) {
|
||||
mergedRule[key] = clonePlainData(value);
|
||||
return;
|
||||
}
|
||||
if (isPlainObject(value)) {
|
||||
mergedRule[key] = clonePlainData(value);
|
||||
return;
|
||||
}
|
||||
mergedRule[key] = value;
|
||||
});
|
||||
});
|
||||
|
||||
return mergedRule;
|
||||
}
|
||||
|
||||
function isSiteRuleDisabled(rule) {
|
||||
return Boolean(
|
||||
rule &&
|
||||
(
|
||||
rule.enabled === false ||
|
||||
(typeof rule.enabled === "undefined" && rule.disableExtension === true)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
global.vscClonePlainData = clonePlainData;
|
||||
global.vscAreComparableValuesEqual = areComparableValuesEqual;
|
||||
global.vscDeepMergeDefaults = deepMergeDefaults;
|
||||
global.vscBuildStoredSettingsDiff = buildStoredSettingsDiff;
|
||||
global.vscExpandStoredSettings = expandStoredSettings;
|
||||
global.vscGetSettingsDefaults = function () {
|
||||
return clonePlainData(DEFAULT_SETTINGS);
|
||||
};
|
||||
global.vscGetManagedSyncKeys = function () {
|
||||
return MANAGED_SYNC_KEYS.slice();
|
||||
};
|
||||
global.vscGetSiteRulesDiffFormat = function () {
|
||||
return SITE_RULES_DIFF_FORMAT;
|
||||
};
|
||||
global.vscMatchSiteRule = mergeMatchingSiteRules;
|
||||
global.vscSiteRuleMatchesUrl = siteRuleMatchesUrl;
|
||||
global.vscIsSiteRuleDisabled = isSiteRuleDisabled;
|
||||
})(typeof globalThis !== "undefined" ? globalThis : this);
|
||||
Reference in New Issue
Block a user