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.

Sign up for GitHub

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

Theme swiching continued, this time working :) #2076

Merged
merged 5 commits into from
Mar 9, 2024
Merged

Theme swiching continued, this time working :) #2076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d52eb4a
Theme swiching (#3)
raszpl Mar 7, 2024
27eaa03
fixed cookie PREF f6 handling
raszpl Mar 8, 2024
d1b675c
functions.js formatting, indentation, added setPrefCookieValueByName
raszpl Mar 8, 2024
d784c3b
Update themes.js
raszpl Mar 8, 2024
23bdb23
Update settings.js
raszpl Mar 8, 2024
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
251 changes: 170 additions & 81 deletions js&css/web-accessible/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/*--------------------------------------------------------------
# GLOBAL VARIABLE
--------------------------------------------------------------*/

var ImprovedTube = {
messages: {
queue: []
Expand Down Expand Up @@ -153,7 +153,7 @@ document.addEventListener('it-message-from-extension', function () {

if (message.action === 'storage-loaded') {
ImprovedTube.storage = message.storage;

if (ImprovedTube.storage.block_vp9 || ImprovedTube.storage.block_av1 || ImprovedTube.storage.block_h264) {
let atlas = {block_vp9:'vp9|vp09', block_h264:'avc1', block_av1:'av01'}
localStorage['it-codec'] = Object.keys(atlas).reduce(function (all, key) {
Expand All @@ -167,105 +167,194 @@ document.addEventListener('it-message-from-extension', function () {
localStorage.removeItem('it-player30fps');
}

// FEEDBACK WHEN THE USER CHANGED A SETTING
// FEEDBACK WHEN THE USER CHANGED A SETTING
ImprovedTube.init();
} else if (message.action === 'storage-changed') {
var camelized_key = message.camelizedKey;

ImprovedTube.storage[message.key] = message.value;
if(['block_vp9', 'block_h264', 'block_av1'].includes(message.key)){
if (['block_vp9', 'block_h264', 'block_av1'].includes(message.key)) {
let atlas = {block_vp9:'vp9|vp09', block_h264:'avc1', block_av1:'av01'}
localStorage['it-codec'] = Object.keys(atlas).reduce(function (all, key) {
return ImprovedTube.storage[key] ? ((all?all+'|':'') + atlas[key]) : all}, '');
if (!localStorage['it-codec']) {
localStorage.removeItem('it-codec');
}
}
if(message.key==="player_60fps"){
if (message.key==="player_60fps") {
if (ImprovedTube.storage.player_60fps === false) {
localStorage['it-player30fps'] = true;
localStorage['it-player30fps'] = true;
} else {
localStorage.removeItem('it-player30fps');
}
}
if(ImprovedTube.storage[message.key]==="when_paused"){
if (ImprovedTube.storage[message.key]==="when_paused") {
ImprovedTube.whenPaused();
};
if (camelized_key === 'blocklistActivate') {
camelized_key = 'blocklist';
} else if (camelized_key === 'playerPlaybackSpeed' || camelized_key === 'playerForcedPlaybackSpeed')
{ if ( ImprovedTube.storage.player_forced_playback_speed === true ) { ImprovedTube.elements.player.setPlaybackRate(Number(ImprovedTube.storage.player_playback_speed)); ImprovedTube.elements.player.querySelector('video').playbackRate = Number(ImprovedTube.storage.player_playback_speed) }
if ( ImprovedTube.storage.player_forced_playback_speed === false) { ImprovedTube.elements.player.setPlaybackRate(Number(1)); ImprovedTube.elements.player.querySelector('video').playbackRate = Number(1) }
} else if (camelized_key === 'theme') {
ImprovedTube.myColors();
ImprovedTube.setTheme();
} else if (camelized_key === 'description') {
if (ImprovedTube.storage.description === "expanded" || ImprovedTube.storage.description === "classic_expanded" )
{try{document.querySelector("#more").click() || document.querySelector("#expand").click() ;} catch{} }
if (ImprovedTube.storage.description === "normal" || ImprovedTube.storage.description === "classic" )
{try{document.querySelector("#less").click() || document.querySelector("#collapse").click();} catch{}}
ImprovedTube.improvedtubeYoutubeButtonsUnderPlayer();
}
else if (camelized_key === 'transcript') {
if (ImprovedTube.storage.transcript === true) {document.querySelector('*[target-id*=transcript]')?.removeAttribute('visibility');}
if (ImprovedTube.storage.transcript === false){document.querySelector('*[target-id*=transcript] #visibility-button button')?.click();}
}
else if (camelized_key === 'chapters') {
if (ImprovedTube.storage.chapters === true){document.querySelector('*[target-id*=chapters]')?.removeAttribute('visibility');}
if (ImprovedTube.storage.chapters === false){document.querySelector('*[target-id*=chapters] #visibility-button button')?.click();}
}
else if (camelized_key === 'commentsSidebar') {
if(ImprovedTube.storage.comments_sidebar === false)
{document.querySelector("#below").appendChild(document.querySelector("#comments"));
document.querySelector("#secondary").appendChild(document.querySelector("#related")); }
else{ImprovedTube.commentsSidebar();}
}
else if (camelized_key === 'forcedTheaterMode') { if(ImprovedTube.storage.forced_theater_mode === false && ImprovedTube.elements.ytd_watch && ImprovedTube.elements.player){
var button = ImprovedTube.elements.player.querySelector("button.ytp-size-button");
if (button && ImprovedTube.elements.ytd_watch.theater === true) {
ImprovedTube.elements.ytd_watch.theater = false;
setTimeout(function () { button.click();}, 100); }
}
} else if (camelized_key === 'playerScreenshotButton' && ImprovedTube.storage.player_screenshot_button === false) {
if (ImprovedTube.elements.buttons['it-screenshot-button']) {
ImprovedTube.elements.buttons['it-screenshot-button']?.remove(); ImprovedTube.elements.buttons['it-screenshot-styles']?.remove();}
} else if (camelized_key === 'playerRepeatButton' && ImprovedTube.storage.player_repeat_button === false) {
if (ImprovedTube.elements.buttons['it-repeat-button']) {
ImprovedTube.elements.buttons['it-repeat-button']?.remove(); ImprovedTube.elements.buttons['it-repeat-styles']?.remove();}
} else if (camelized_key === 'playerPopupButton' && ImprovedTube.storage.player_popup_button === false) {
ImprovedTube.elements.buttons['it-popup-player-button']?.remove();
} else if (camelized_key === 'playerRotateButton' && ImprovedTube.storage.player_rotate_button === false) {
ImprovedTube.elements.buttons['it-rotate-button']?.remove(); ImprovedTube.elements.buttons['it-rotate-styles']?.remove();
} else if ( camelized_key === 'playerFitToWinButton' && ImprovedTube.storage.player_fit_to_win_button === false) {
ImprovedTube.elements.buttons['it-fit-to-win-player-button']?.remove();
document.querySelector("html")?.setAttribute("it-player-size", ImprovedTube.storage.player_size ?? "do_not_change");
} else if (camelized_key === 'playerHamburgerButton') { if(ImprovedTube.storage.player_hamburger_button == false) {
document.querySelector('.custom-hamburger-menu')?.remove();
let rightControls = document.querySelector('.html5-video-player')?.querySelector('.ytp-right-controls');
if (rightControls) {
rightControls.style.setProperty('padding-right', ''); // Restoring the original padding:
rightControls.style.setProperty('display', 'flex'); } }
} else if ( camelized_key === 'belowPlayerPip' ){
if (ImprovedTube.storage.below_player_pip === false) { document.querySelector('.improvedtube-player-button[data-tooltip="PiP"]')?.remove();}
if (ImprovedTube.storage.below_player_pip === true) { document.querySelectorAll('.improvedtube-player-button').forEach(e => e.remove()); ImprovedTube.improvedtubeYoutubeButtonsUnderPlayer(); }
} else if ( camelized_key === 'belowPlayerScreenshot' ){
if (ImprovedTube.storage.below_player_screenshot === false) { document.querySelector('.improvedtube-player-button[data-tooltip="Screenshot"]')?.remove();}
if (ImprovedTube.storage.below_player_screenshot === true) { document.querySelectorAll('.improvedtube-player-button').forEach(e => e.remove());; ImprovedTube.improvedtubeYoutubeButtonsUnderPlayer(); }
} else if ( camelized_key === 'belowPlayerLoop' ){
if (ImprovedTube.storage.below_player_loop === false) { document.querySelector('.improvedtube-player-button[data-tooltip="Loop"]')?.remove();}
if (ImprovedTube.storage.below_player_loop === true) { document.querySelectorAll('.improvedtube-player-button').forEach(e => e.remove()); ImprovedTube.improvedtubeYoutubeButtonsUnderPlayer(); }
} else if ( camelized_key === 'dayOfWeek') {
if (ImprovedTube.storage.day_of_week === false) { document.querySelector(".ytd-day-of-week")?.remove(); }
if (ImprovedTube.storage.day_of_week === true) { ImprovedTube.dayOfWeek(); }
} else if ( camelized_key === 'playerRemainingDuration' ) {
if (ImprovedTube.storage.player_remaining_duration === false) {document.querySelector(".ytp-time-remaining-duration")?.remove();}
if (ImprovedTube.storage.player_remaining_duration === true) { ImprovedTube.playerRemainingDuration(); }
} else if (camelized_key === 'blocklistActivate' ) {

switch(camelized_key) {
case 'blocklistActivate':
camelized_key = 'blocklist';
break

case 'playerPlaybackSpeed':
case 'playerForcedPlaybackSpeed':
if (ImprovedTube.storage.player_forced_playback_speed === true) {
ImprovedTube.elements.player.setPlaybackRate(Number(ImprovedTube.storage.player_playback_speed));
ImprovedTube.elements.player.querySelector('video').playbackRate = Number(ImprovedTube.storage.player_playback_speed);
} else if (ImprovedTube.storage.player_forced_playback_speed === false) {
ImprovedTube.elements.player.setPlaybackRate(1);
ImprovedTube.elements.player.querySelector('video').playbackRate = 1;
}
break

case 'theme':
case 'themePrimaryColor':
case 'themeTextColor':
ImprovedTube.setTheme();
break

case 'description':
if (ImprovedTube.storage.description === "expanded" || ImprovedTube.storage.description === "classic_expanded") {
try{document.querySelector("#more").click() || document.querySelector("#expand").click();} catch{}
} else if (ImprovedTube.storage.description === "normal" || ImprovedTube.storage.description === "classic") {
try{document.querySelector("#less").click() || document.querySelector("#collapse").click();} catch{}
}
ImprovedTube.improvedtubeYoutubeButtonsUnderPlayer();
break

case 'transcript':
if (ImprovedTube.storage.transcript === true) {
document.querySelector('*[target-id*=transcript]')?.removeAttribute('visibility');
} else if (ImprovedTube.storage.transcript === false) {
document.querySelector('*[target-id*=transcript] #visibility-button button')?.click();
}
break

case 'chapters':
if (ImprovedTube.storage.chapters === true) {
document.querySelector('*[target-id*=chapters]')?.removeAttribute('visibility');
} else if (ImprovedTube.storage.chapters === false) {
document.querySelector('*[target-id*=chapters] #visibility-button button')?.click();
}
break

case 'commentsSidebar':
if (ImprovedTube.storage.comments_sidebar === false) {
document.querySelector("#below").appendChild(document.querySelector("#comments"));
document.querySelector("#secondary").appendChild(document.querySelector("#related"));
} else {
ImprovedTube.commentsSidebar();
}
break

case 'forcedTheaterMode':
if (ImprovedTube.storage.forced_theater_mode === false && ImprovedTube.elements.ytd_watch && ImprovedTube.elements.player) {
var button = ImprovedTube.elements.player.querySelector("button.ytp-size-button");
if (button && ImprovedTube.elements.ytd_watch.theater === true) {
ImprovedTube.elements.ytd_watch.theater = false;
setTimeout(function () { button.click();}, 100);
}
}
break

case 'playerScreenshotButton':
if (ImprovedTube.storage.player_screenshot_button === false) {
if (ImprovedTube.elements.buttons['it-screenshot-button']) {
ImprovedTube.elements.buttons['it-screenshot-button']?.remove();
ImprovedTube.elements.buttons['it-screenshot-styles']?.remove();
}
}
break

case 'playerRepeatButton':
if (ImprovedTube.storage.player_repeat_button === false) {
if (ImprovedTube.elements.buttons['it-repeat-button']) {
ImprovedTube.elements.buttons['it-repeat-button']?.remove();
ImprovedTube.elements.buttons['it-repeat-styles']?.remove();
}
}
break

case 'playerPopupButton':
if (ImprovedTube.storage.player_popup_button === false) {
ImprovedTube.elements.buttons['it-popup-player-button']?.remove();
}
break

case 'playerRotateButton':
if (ImprovedTube.storage.player_rotate_button === false) {
ImprovedTube.elements.buttons['it-rotate-button']?.remove();
ImprovedTube.elements.buttons['it-rotate-styles']?.remove();
}
break

case 'playerFitToWinButton':
if (ImprovedTube.storage.player_fit_to_win_button === false) {
ImprovedTube.elements.buttons['it-fit-to-win-player-button']?.remove();
document.querySelector("html")?.setAttribute("it-player-size", ImprovedTube.storage.player_size ?? "do_not_change");
}
break

case 'playerHamburgerButton':
if (ImprovedTube.storage.player_hamburger_button == false) {
document.querySelector('.custom-hamburger-menu')?.remove();
let rightControls = document.querySelector('.html5-video-player')?.querySelector('.ytp-right-controls');
if (rightControls) {
rightControls.style.setProperty('padding-right', ''); // Restoring the original padding:
rightControls.style.setProperty('display', 'flex');
}
}
break

case 'belowPlayerPip':
if (ImprovedTube.storage.below_player_pip === false) {
document.querySelector('.improvedtube-player-button[data-tooltip="PiP"]')?.remove();
} else if (ImprovedTube.storage.below_player_pip === true) {
document.querySelectorAll('.improvedtube-player-button').forEach(e => e.remove());
ImprovedTube.improvedtubeYoutubeButtonsUnderPlayer();
}
break

case 'belowPlayerScreenshot':
if (ImprovedTube.storage.below_player_screenshot === false) {
document.querySelector('.improvedtube-player-button[data-tooltip="Screenshot"]')?.remove();
} else if (ImprovedTube.storage.below_player_screenshot === true) {
document.querySelectorAll('.improvedtube-player-button').forEach(e => e.remove());
ImprovedTube.improvedtubeYoutubeButtonsUnderPlayer();
}
break

case 'belowPlayerLoop':
if (ImprovedTube.storage.below_player_loop === false) {
document.querySelector('.improvedtube-player-button[data-tooltip="Loop"]')?.remove();
} else if (ImprovedTube.storage.below_player_loop === true) {
document.querySelectorAll('.improvedtube-player-button').forEach(e => e.remove());
ImprovedTube.improvedtubeYoutubeButtonsUnderPlayer();
}
break

case 'dayOfWeek':
if (ImprovedTube.storage.day_of_week === false) {
document.querySelector(".ytd-day-of-week")?.remove();
} else if (ImprovedTube.storage.day_of_week === true) {
ImprovedTube.dayOfWeek();
}
break

case 'playerRemainingDuration':
if (ImprovedTube.storage.player_remaining_duration === false) {
document.querySelector(".ytp-time-remaining-duration")?.remove();
} else if (ImprovedTube.storage.player_remaining_duration === true) {
ImprovedTube.playerRemainingDuration();
}
break

case 'blocklistActivate':
if (ImprovedTube.storage.blocklist_activate === true) {document.querySelectorAll('.it-add-to-blocklist').forEach(e => e.remove());}
//We do this type automatically: //} else if ( camelized_key === 'hideVideoTitleFullScreen' ) {
//if (ImprovedTube.storage.hide_video_title_fullScreen === false) {document.querySelector(".ytp-title-text > a")?.style.setProperty('display', 'block');}
//if (ImprovedTube.storage.hide_video_title_fullScreen === true) {document.querySelector(".ytp-title-text > a")?.style.setProperty('display', 'none'); }
break
}

if (ImprovedTube[camelized_key]) {
try{ImprovedTube[camelized_key]()}catch{};
}
Expand Down Expand Up @@ -330,4 +419,4 @@ ImprovedTube.messages.send = function (message) {

document.dispatchEvent(new CustomEvent('it-message-from-youtube'));
}
};
};
Loading