tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine ejectCss and injectCss into a single function

Browse Source
This commit is contained in:
Tamius Han 2019-08-24 00:28:08 +02:00
parent 68b3589e77
commit eeddbe9cc6
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ext/lib/comms/CommsServer.js
View File

@ -224,6 +224,9 @@ class CommsServer {
this.server.removeCss(message.cssString, sender);
return;
}
if (message.cmd === 'replace-css') {
this.server.replaceCss(message.oldCssString, message.newCssString, sender);
}
if (message.forwardToContentScript) {
if (Debug.debug && Debug.comms) {

8
src/ext/lib/video-data/PageInfo.js
View File

@ -55,6 +55,14 @@ class PageInfo {
});
}
replaceCss(oldCssString, newCssString) {
this.comms.sendMessage({
cmd: 'replace-css',
newCssString,
oldCssString
});
}
destroy() {
if(Debug.debug || Debug.init){
console.log("[PageInfo::destroy] destroying all videos!")

27
src/ext/lib/video-transform/Resizer.js
View File

@ -77,6 +77,10 @@ class Resizer {
ejectCss(css) {
this.conf.pageInfo.ejectCss(css);
}
replaceCss(oldCss, newCss) {
this.conf.pageInfo.replaceCss(oldCss, newCss);
}
prepareCss(css) {
return `.${this.userCssClassName} {${css}}`;
@ -639,20 +643,21 @@ class Resizer {
}
setStyleString (styleString) {
// this.video.setAttribute("style", styleString);
this.currentCssValidFor = this.conf.player.dimensions;
const newCssString = this.prepareCss(styleString);
// remove old CSS
if (this.userCss) {
this.ejectCss(this.userCss);
// inject new CSS or replace existing one
if (!this.userCss) {
this.injectCss(newCssString);
this.userCss = newCssString;
} else {
this.replaceCss(this.userCss, newCssString);
this.userCss = newCssString;
}
// this.currentStyleString = styleString;
this.currentCssValidFor = this.conf.player.dimensions;
this.userCss = this.prepareCss(styleString);
// inject new CSS
this.injectCss(this.userCss);
this.video.classList.add(this.userCssClassName);
// browser checks and ignores duplicate classes, so no point in checking whether we've already
// added the extra class ourselves on top of that. Twice the work, but not much benefit
this.video.classList.add(this.userCssClassName);
if (this.restore_wd) {
if (!this.video){

9
src/ext/uw-bg.js
View File

@ -58,7 +58,7 @@ class UWServer {
console.log("[uwbg::injectCss] Injecting CSS:", css, sender);
}
if (BrowserDetect.firefox || BrowserDetect.edge) {
await browser.tabs.insertCSS(sender.tab.id, {code: css, cssOrigin: 'user', frameId: sender.frameId});
browser.tabs.insertCSS(sender.tab.id, {code: css, cssOrigin: 'user', frameId: sender.frameId});
} else if (BrowserDetect.chrome) {
chrome.tabs.insertCSS(sender.tab.id, {code: css, cssOrigin: 'user', frameId: sender.frameId});
}
@ -68,7 +68,7 @@ class UWServer {
}
}
}
removetCss(css, sender) {
async removeCss(css, sender) {
if (BrowserDetect.firefox || BrowserDetect.edge) {
browser.tabs.removeCSS(sender.tab.id, {code: css, cssOrigin: 'user', frameId: sender.frameId});
} else if (BrowserDetect.chrome) {
@ -76,6 +76,11 @@ class UWServer {
}
}
async replaceCss(oldCss, newCss, sender) {
this.injectCss(newCss, sender);
this.removeCss(oldCss, sender);
}
scheduleGc(timeout) {
if (this._gctimeout) {
return;