Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing it such that it only sets the playback speed when focus is rem… #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 44 additions & 24 deletions content-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
var code = `
var base = document.createElement; /* A backup reference to the browser's original document.createElement */
var VideoElementsMade = []; /* Array of video/audio elements made by spotify's scripts */

function debugLog(text) {
console.log(text)
}

/* Replacing the DOM's original reference to the browser's createElement function */
document.createElement = function(message) {
Expand All @@ -33,10 +37,13 @@ var code = `
function getStoredSpeed(){ /* Gets stored speed between refreshes*/
return localStorage.getItem('speed');
}

// locally cache the speed, so getStoredSpeed does not need to be called repetitively
var lastSpeed = getStoredSpeed() || 1.0; /* if stored speed is null make lastSpeed 1.0 */

function setStoredSpeed(value){ /* Sets variable in the site's cookie along-side spotify's stuff */
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
function setStoredSpeed(value){ /* Sets variable in the site's cookie along-side spotify's stuff */
function setStoredSpeed(value){ /* Stores speed in the site's localStorage alongside Spotify's stuff */

localStorage.setItem('speed',value);
lastSpeed = value;
}

/* Building our playback speed input element */
Expand All @@ -48,49 +55,62 @@ var code = `
+ 'width: 45px;'
+ 'margin: 5px;';
input.value = lastSpeed * 100;
input.oninput = function(e){ /* What happens when we change the number in our input box element */
validateAndChangeSpeed(); /* We call our function */
input.onkeypress = function(e){ /* What happens when we change the number in our input box element */
if(e.code == "Enter") {
Copy link

@faf0 faf0 Mar 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if(e.code == "Enter") {
if (e.code === "Enter") {

validateAndChangeSpeed();
}
};
input.onblur = function() {
// "onfocusout" event not working
validateAndChangeSpeed();
};

function validateAndChangeSpeed(value){
var val = parseFloat( value || (input.value / 100)); /* val must be in format 0.0625 - 16.0 https://stackoverflow.com/a/32320020 */
if(!isNaN(val)){ /* check if val is a number */
changeSpeed(val);
var val = parseFloat( value || (input.value / 100));
if(!isNaN(val) && (val != lastSpeed)){
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if(!isNaN(val) && (val != lastSpeed)){
if (!isNaN(val) && (val !== lastSpeed)) {

/* only change if input is valid and it changed */
setStoredSpeed(val);
videosChangeSpeed(val);
}
}

function changeSpeed(val) {
function videosChangeSpeed(val) {
for(var i = 0; i < VideoElementsMade.length; i++){ /* change speed for all elements found (i havent seen this be more than 1 but you never know) */
VideoElementsMade[i].playbackRate = val; /* set the playback rate here */
if(val != lastSpeed){ /* update the lastSpeed if the speed actually changed */
lastSpeed = val;
setStoredSpeed(val);
/* val is clamped to range 0.0625 - 16.0 https://stackoverflow.com/a/32320020 */
if (VideoElementsMade[i].playbackRate != val) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (VideoElementsMade[i].playbackRate != val) {
if (VideoElementsMade[i].playbackRate !== val) {

debugLog("changing playback rate from " + VideoElementsMade[i].playbackRate + " to " + val)
}
VideoElementsMade[i].playbackRate = val; /* set the playback rate here */
VideoElementsMade[i].defaultPlaybackRate = val;
}
}

function timeout() { /* This function is called by itself over and over */
if(document.getElementById('speed-extension-input') == null) /* check if our input element doesnt exist */
{
try {
document.getElementsByClassName('now-playing-bar__right')[0].appendChild (input); /* make our input exist on page */
}catch{
setTimeout(timeout, 100);/*now-playing-bar__right doesnt exist yet so lets try again in 100ms*/
return;
}
function addSpeedInput() { /* adds speed input next to playing bar */
debugLog("Adding speed input");
try {
document.getElementsByClassName('now-playing-bar__right')[0].appendChild (input); /* make our input exist on page */
Copy link

@faf0 faf0 Mar 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
document.getElementsByClassName('now-playing-bar__right')[0].appendChild (input); /* make our input exist on page */
document.getElementsByClassName('volume-bar')[0].appendChild(input); /* add input to page */

fixes #7

debugLog("Added speed input");
}catch{
Copy link

@faf0 faf0 Mar 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}catch{
} catch {

setTimeout(addSpeedInput, 100);/*now-playing-bar__right doesnt exist yet so lets try again in 100ms*/
return;
}
}

addSpeedInput();

function ensureSpeedNotChanged() {
/* sometimes playbackRate is set back to 1.0 by spotify's code so timeout just ensures it goes the speed the user desires */
Copy link

@faf0 faf0 Mar 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/* sometimes playbackRate is set back to 1.0 by spotify's code so timeout just ensures it goes the speed the user desires */
/* sometimes Spotify's code resets playbackRate to 1.0, so ensure that the speed matches the user's setting after every timeout */

setTimeout(function () { /* setTimeout is a delayed call(500 milliseconds) to the code below */
try {
validateAndChangeSpeed(lastSpeed); /* this is in a try/catch because if an error happens timeout wouldnt be called again. */
/* this is in a try/catch because if an error happens timeout wouldnt be called again. */
validateAndChangeSpeed(lastSpeed);
}catch{

}
timeout(); /* call timeout again which starts the loop and eventually it will come back here */
ensureSpeedNotChanged(); /* call timeout again which starts the loop and eventually it will come back here */
}, 500); /* 500ms */
}

timeout(); /* starts the loop to check and create our inputbox and to set the playback speed without having to mess with input box(by refreshing and having it load from cookie) */
/* sometimes playbackRate is set back to 1.0 by spotify's code so timeout just ensures it goes the speed the user desires */
ensureSpeedNotChanged();
};`;
/* ======== End of code string literal ======== */
var script = document.createElement('script'); /* Create our dummy script to be inserted with our code variable */
Expand Down