Narcissus/ms365-electron
2
0
Fork 0
mirror of https://github.com/agam778/MS-365-Electron.git synced 2026-02-17 09:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable/Disable ad blocking in all windows when turned on/off from menu

Browse Source
This commit is contained in:
Agampreet Singh
2024-05-08 21:53:13 +05:30
parent aaa862364e
commit 6f49a5554f
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/menu.js
View File

@@ -394,13 +394,15 @@ const menulayout = [
message: "Ads and trackers will no longer be blocked.",
buttons: ["OK"],
});
ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then(
(blocker) => {
blocker.disableBlockingInSession(
BrowserWindow.getFocusedWindow().webContents.session
);
ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then((blocker) => {
BrowserWindow.getAllWindows().forEach(window => {
blocker.disableBlockingInSession(window.webContents.session);
});
}).catch((error) => {
if (error.message !== "Trying to disable blocking which was not enabled") {
console.error(error);
}
);
});
return;
}
if (
@@ -408,11 +410,10 @@ const menulayout = [
getValue("blockadsandtrackers") === undefined
) {
setValue("blockadsandtrackers", "true");
ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then(
(blocker) => {
blocker.enableBlockingInSession(
BrowserWindow.getFocusedWindow().webContents.session
);
ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then((blocker) => {
BrowserWindow.getAllWindows().forEach(window => {
blocker.enableBlockingInSession(window.webContents.session);
})
dialog.showMessageBoxSync({
type: "info",
title: "Block Ads and Trackers",
@@ -749,13 +750,15 @@ const menulayout = [
message: "Ads and trackers will no longer be blocked.",
buttons: ["OK"],
});
ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then(
(blocker) => {
blocker.disableBlockingInSession(
BrowserWindow.getFocusedWindow().webContents.session
);
ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then((blocker) => {
BrowserWindow.getAllWindows().forEach(window => {
blocker.disableBlockingInSession(window.webContents.session);
});
}).catch((error) => {
if (error.message !== "Trying to disable blocking which was not enabled") {
console.error(error);
}
);
});
return;
}
if (
@@ -763,11 +766,10 @@ const menulayout = [
getValue("blockadsandtrackers") === undefined
) {
setValue("blockadsandtrackers", "true");
ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then(
(blocker) => {
blocker.enableBlockingInSession(
BrowserWindow.getFocusedWindow().webContents.session
);
ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then((blocker) => {
BrowserWindow.getAllWindows().forEach(window => {
blocker.enableBlockingInSession(window.webContents.session);
})
dialog.showMessageBoxSync({
type: "info",
title: "Block Ads and Trackers",