idk/I2P_in_Private_Browsing_Mode_for_Firefox
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete workaround to theme reset issue

Browse Source
This commit is contained in:
idk
2021-07-07 22:34:01 -04:00
parent 7b6438dce5
commit 7bd7701aeb
1 changed files with 14 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
background.js
View File

@@ -203,7 +203,8 @@ let dtheme = {
function themeWindow(window) {
// Check if the window is in private browsing
function onThemeError() {
console.log("theme color set error");
console.log("(theme) color set error");
browser.theme.reset();
}
function dynamicTheme() {
@@ -215,7 +216,7 @@ function themeWindow(window) {
}
function browserTheme() {
console.log("Active in I2P window");
console.log("(theme)Active in I2P window");
if (window.incognito) {
browser.theme.update(window.id, btheme);
} else {
@@ -224,7 +225,7 @@ function themeWindow(window) {
}
function unsetTheme() {
browser.theme.reset()
browser.theme.reset();
}
function logTabs(tabInfo) {
function onContextGotTheme(context) {
@@ -232,30 +233,31 @@ function themeWindow(window) {
browserTheme();
browser.pageAction.show(tabInfo[0].id);
} else if (context.name == routerpref) {
console.log("Active in Router Console window");
console.log("(theme) Active in Router Console window");
dynamicTheme();
} else if (context.name == tunnelpref) {
console.log("Active in Hidden Services Manager window");
console.log("(theme) Active in Hidden Services Manager window");
dynamicTheme();
} else if (context.name == mailpref) {
console.log("Active in Web Mail window");
console.log("(theme) Active in Web Mail window");
dynamicTheme();
} else if (context.name == torrentpref) {
console.log("Active in Bittorrent window");
console.log("(theme) Active in Bittorrent window");
dynamicTheme();
} else if (context.name == botepref) {
console.log("Active in Bote window");
console.log("(theme) Active in Bote window");
dynamicTheme();
} else if (context.name == ircpref) {
console.log("Active in IRC window");
console.log("(theme) Active in IRC window");
dynamicTheme();
} else if (context.name == blogpref) {
console.log("Active in Blog window");
console.log("(theme) (theme) Active in Blog window");
dynamicTheme();
} else if (context.name == muwirepref) {
console.log("Active in MuWire window");
console.log("(theme) Active in MuWire window");
dynamicTheme();
} else {
console.log("(theme) Not active in MuWire window");
browser.theme.reset();
}
}
@@ -267,7 +269,7 @@ function themeWindow(window) {
.get(tabInfo[0].cookieStoreId)
.then(onContextGotTheme, onThemeError);
} else {
console.log("Not active in I2P window");
console.log("(theme) Not active in I2P window");
browser.theme.reset();
}
}
@@ -373,52 +375,6 @@ gettingListenerInfo.then((got) => {
}
});
function handleUpdated(updateInfo) {
function maybeSet(them) {
console.log("original theme found:", them, Object.keys(them).length);
try {
if (updateInfo.theme.colors != null) {
console.log(
"testing theme",
updateInfo.theme.colors.toolbar,
"!=",
btheme.colors.toolbar
);
console.log(
"testing theme",
updateInfo.theme.colors.toolbar,
"!=",
dtheme.colors.toolbar
);
if (
updateInfo.theme.colors.toolbar != dtheme.colors.toolbar &&
updateInfo.theme.colors.toolbar != btheme.colors.toolbar
) {
function onSet() {
console.log("stored theme:", updateInfo.theme);
}
/*if (
updateInfo.theme.colors != null &&
updateInfo.theme.images != null &&
updateInfo.theme.properties != null
) {*/
console.log("storing theme:", updateInfo.theme);
browser.storage.local
.set({ originalTheme: updateInfo.theme })
.then(onSet, onError);
//}
}
}
} catch (e) {
console.log("theme storage error", e);
}
}
console.log("Handling theme", updateInfo);
browser.storage.local.get("originalTheme").then(maybeSet, onError);
}
browser.theme.onUpdated.addListener(handleUpdated);
function handleClick() {
console.log("Opening page action");
browser.pageAction.openPopup();