Skip to content

Commit

Permalink
Merge pull request #24 from Thunderarea/test
Browse files Browse the repository at this point in the history 
version 6.4.8
  • Loading branch information
@Thunderarea
Thunderarea authored May 22, 2024
2 parents c65a111 + 4a9f10c commit 6fa67b3
Show file tree
Hide file tree
Showing 10 changed files with 201 additions and 162 deletions.
25 changes: 25 additions & 0 deletions source/css/content.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 48 additions & 14 deletions source/css/video_thumbnails2.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
:root {
--yt-primary-color: #323232;
}

/*thumbnail*/
ytd-thumbnail-overlay-time-status-renderer {
height: 100% !important;
Expand All @@ -7,7 +11,7 @@ ytd-thumbnail-overlay-time-status-renderer {
align-items: center !important;
padding: 0 !important;
margin: 0 !important;
background-color: #323232 !important;
background-color: var(--yt-primary-color) !important;
}

ytd-thumbnail img {
Expand All @@ -17,7 +21,7 @@ ytd-thumbnail img {
/*playlist-mix*/
ytd-thumbnail-overlay-side-panel-renderer {
width: 100% !important;
background-color: #323232 !important;
background-color: var(--yt-primary-color) !important;
}

.iv-card-image {
Expand All @@ -32,15 +36,15 @@ ytd-thumbnail-overlay-side-panel-renderer {
right: 0 !important;
text-align: center !important;
padding: 5px 0 !important;
background-color: #323232 !important;
background-color: var(--yt-primary-color) !important;
}

.iv-card-image-text {
position: relative !important;
display: block !important;
padding: 5px !important;
background-image: none !important;
background-color: #323232 !important;
background-color: var(--yt-primary-color) !important;
}

.iv-card-playlist .iv-card-image-overlay {
Expand Down Expand Up @@ -99,11 +103,11 @@ ytd-movie-offer-module-renderer yt-img-shadow {
}

.ytp-show-tiles .ytp-videowall-still .ytp-videowall-still-image {
background-image: url('../img/youtube_logo.svg') !important;
background-image: url("../img/youtube_logo.svg") !important;
background-repeat: no-repeat !important;
background-position: center !important;
background-size: 30% 30% !important;
background-color: #323232 !important;
background-color: var(--yt-primary-color) !important;
}

.ytp-tooltip.ytp-text-detail.ytp-preview .ytp-tooltip-bg {
Expand Down Expand Up @@ -165,7 +169,8 @@ ytd-playlist-renderer img,
ytd-radio-renderer img,
ytd-video-renderer img,
ytd-playlist-panel-supported-items img,
ytd-playlist-panel-video-renderer img {
ytd-playlist-panel-video-renderer img,
ytd-rich-item-renderer img {
display: none !important;
}

Expand All @@ -178,12 +183,14 @@ ytd-rich-movie-renderer ytd-thumbnail {
height: 118px !important;
}

ytd-thumbnail #overlays, ytd-grid-movie-renderer yt-img-shadow, ytd-rich-movie-renderer yt-img-shadow {
background-image: url('../img/youtube_logo.svg') !important;
ytd-thumbnail #overlays,
ytd-grid-movie-renderer yt-img-shadow,
ytd-rich-movie-renderer yt-img-shadow {
background-image: url("../img/youtube_logo.svg") !important;
background-repeat: no-repeat !important;
background-position: center !important;
background-size: 40% 40% !important;
background-color: #323232 !important;
background-color: var(--yt-primary-color) !important;
height: 100% !important;
width: 100% !important;
}
Expand Down Expand Up @@ -255,7 +262,7 @@ ytd-thumbnail-overlay-bottom-panel-renderer {
width: 100%;
margin-right: 0 !important;
margin-bottom: 0 !important;
background-color: #323232 !important;
background-color: var(--yt-primary-color) !important;
justify-content: center !important;
}

Expand Down Expand Up @@ -303,14 +310,41 @@ ytd-compact-station-renderer .flex-container.ytd-compact-station-renderer {

.ytp-autonav-endscreen-upnext-thumbnail,
.ytp-autonav-endscreen-upnext-button {
background-color: #323232 !important;
background-color: var(--yt-primary-color) !important;
}

/* Delete the video thumbnail when you hover over the video */
#media-container #thumbnail-container {
display: none !important;
}

#time-status.ytd-thumbnail-overlay-time-status-renderer {
#time-status.ytd-thumbnail-overlay-time-status-renderer,
ytd-thumbnail-overlay-time-status-renderer badge-shape {
background-color: transparent !important;
}
}

/* Playlists in Playlists page */
yt-thumbnail-overlay-badge-view-model {
width: 100% !important;
height: 100% !important;
margin: 0 !important;
}

yt-thumbnail-overlay-badge-view-model yt-thumbnail-badge-view-model {
width: 100% !important;
height: 100% !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
margin: 0 !important;
}

yt-thumbnail-overlay-badge-view-model yt-thumbnail-badge-view-model badge-shape {
background-color: var(--yt-primary-color) !important;
height: 100% !important;
width: 100% !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
padding: 0 !important;
}
49 changes: 21 additions & 28 deletions source/js/background.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function initialization(initializationReason) {

let enabled = initializeExtensionOptions(storedValues);
initializeBlockingInfo();
chrome.storage.local.set({"blocking_info": blockingInfo});
chrome.storage.local.set({ "blocking_info": blockingInfo });

for (let blockingInfoName in blockingInfo) declareRules(createRules(blockingInfo, blockingInfoName));

Expand All @@ -130,7 +130,7 @@ function initialization(initializationReason) {
chrome.tabs.create({
url: "pages/options.html"
});
}
}
// else if (initializationReason === "update") {
// chrome.tabs.create({
// url: "pages/about.html"
Expand Down Expand Up @@ -172,31 +172,30 @@ chrome.tabs.onRemoved.addListener(tabId => {
removeYouTubeTab(tabId);
chrome.storage.local.get(null, storedValues => {
let ssvalues = storedValues.sstabs;
ssvalues = removeTabFromOptions(ssvalues, tabId, true);
ssvalues = removeTabFromOptions(ssvalues, tabId).list;
chrome.storage.local.set({
'sstabs': ssvalues
});
ssvalues = storedValues.sspages;
ssvalues = removeTabFromOptions(ssvalues, tabId, true);
ssvalues = removeTabFromOptions(ssvalues, tabId).list;
chrome.storage.local.set({
'sspages': ssvalues
});
ssvalues = storedValues.qapages;
ssvalues = removeTabFromOptions(ssvalues, tabId, true);
ssvalues = removeTabFromOptions(ssvalues, tabId).list;
chrome.storage.local.set({
'qapages': ssvalues
});
});
});

function removeTabFromOptions(list, id, getOnlyList) {
function removeTabFromOptions(list, id) {
let found = false;
if (list && list.hasOwnProperty(id)) {
if (list && (id in list)) {
delete list[id];
found = true;
}
if (getOnlyList) return list;
else return {
return {
list: list,
found: found
};
Expand Down Expand Up @@ -230,25 +229,19 @@ function getTabOptions(storedValues, qapage, ssvalue, siteName) {
if (ssvalue != undefined) {
if (!ssvalue.enabled) {
options = getOptionsValues(qapage, true);
} else {
if (ssvalue.options[siteName] != undefined) {
if (!ssvalue.options[siteName].enabled) {
options = getOptionsValues(qapage, true);
} else {
if (ssvalue.options[siteName].options != undefined) {
options = getOptionsValues(qapage, false, ssvalue.options[siteName].options, "");
} else {
options = getOptionsValues(qapage, !storedValues[siteName], storedValues, (siteName + "_"));
}
}
} else if (ssvalue.options[siteName] != undefined) {
if (!ssvalue.options[siteName].enabled) {
options = getOptionsValues(qapage, true);
} else if (ssvalue.options[siteName].options != undefined) {
options = getOptionsValues(qapage, false, ssvalue.options[siteName].options, "");
} else {
options = getOptionsValues(qapage, !storedValues[siteName], storedValues, (siteName + "_"));
}
}
} else if (!storedValues.enabled) {
options = getOptionsValues(qapage, true);
} else {
if (!storedValues.enabled) {
options = getOptionsValues(qapage, true);
} else {
options = getOptionsValues(qapage, !storedValues[siteName], storedValues, (siteName + "_"));
}
options = getOptionsValues(qapage, !storedValues[siteName], storedValues, (siteName + "_"));
}
return options;
}
Expand Down Expand Up @@ -292,7 +285,7 @@ function rulesHandler(info, infoName, tabId, tabOptions) {

function createRules(info, infoName) {
let addRulesList = [],
removeRuleIds = [],
removeRuleIds = [],
addedRule = {},
id = info[infoName].first_id;
info[infoName].rules.forEach(rule => {
Expand Down Expand Up @@ -334,14 +327,14 @@ function detectURLChange(tabId, changeInfo, tab) {
if (typeof changeInfo.url !== "undefined" || changeInfo.status === "complete") {
// the url has changed
chrome.storage.local.get('sspages', storedValues => {
let response = removeTabFromOptions(storedValues.sspages, tabId, false);
let response = removeTabFromOptions(storedValues.sspages, tabId);
if (response.found) {
chrome.storage.local.set({
'sspages': response.list
});
}
chrome.storage.local.get('qapages', val => {
response = removeTabFromOptions(val.qapages, tabId, false);
response = removeTabFromOptions(val.qapages, tabId);
if (response.found) {
chrome.storage.local.set({
'qapages': response.list
Expand Down
Loading

0 comments on commit 6fa67b3

Please sign in to comment.