update v1.2.1

rztprog · web-flow · commit 53abfa335d3e · 2024-04-01T23:33:19.000+02:00
Correction:
- Refinement of the mailCalculator function, now it appears correctly and detects empty folders.

Deletion:
- Remove the Microsoft 365 ad because it no longer exists.

Addition:
- Addition of the Russian language/locale.
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
@@ -4,7 +4,6 @@
 
     "ads_text": {"message": "Werbung"},
     "cfg_hide_left_rail": {"message": "Linkes Menü ausblenden"},
-    "cfg_hide_premium_ad": {"message": "Microsoft 365 Premium-Anzeige ausblenden"},
     "cfg_hide_firstemail_ad": {"message": "Erste E-Mail-Anzeige ausblenden"},
     "cfg_hide_top_icons": {"message": "Symbole für Meet, Skype und OneNote ausblenden"},
 
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -4,7 +4,6 @@
     
     "ads_text": {"message": "Ads"},
     "cfg_hide_left_rail": {"message": "Hide Left Rail"},
-    "cfg_hide_premium_ad": {"message": "Hide Microsoft 365 Premium Ad"},
     "cfg_hide_top_icons": {"message": "Hide Meet, Skype, OneNote icons"},
     "cfg_hide_firstemail_ad": {"message": "Hide First Email Ad"},
 
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
@@ -4,7 +4,6 @@
 
     "ads_text": {"message": "Anuncios"},
     "cfg_hide_left_rail": {"message": "Ocultar el riel izquierdo"},
-    "cfg_hide_premium_ad": {"message": "Ocultar el anuncio de Microsoft 365 Premium"},
     "cfg_hide_firstemail_ad": {"message": "Ocultar el anuncio del primer correo electrónico"},
     "cfg_hide_top_icons": {"message": "Ocultar iconos de Meet, Skype, OneNote"},
 
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
@@ -4,7 +4,6 @@
 
     "ads_text": {"message": "Publicités"},
     "cfg_hide_left_rail": {"message": "Masquer le volet gauche"},
-    "cfg_hide_premium_ad": {"message": "Masquer la publicité Microsoft 365 Premium"},
     "cfg_hide_firstemail_ad": {"message": "Masquer le premier e-mail publicité"},
     "cfg_hide_top_icons": {"message": "Masquer les icônes Meet, Skype, OneNote"},
 
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
@@ -0,0 +1,23 @@
+{
+    "extensionName": {"message": "Outlook Web Plus"},
+    "extensionDescription": {"message": "Удаление рекламы и улучшение почтового ящика Outlook веб."},
+
+    "ads_text": {"message": "Реклама"},
+    "cfg_hide_left_rail": {"message": "Скрыть левую панель"},
+    "cfg_hide_top_icons": {"message": "Скрыть значки Meet, Skype, OneNote"},
+    "cfg_hide_firstemail_ad": {"message": "Скрыть рекламу первого письма"},
+
+    "extras_text": {"message": "Дополнительно"},
+    "cfg_outlook_logo": {"message": "Логотип Outlook+"},
+    "cfg_email_counter": {"message": "Счетчик электронной почты"},
+    "cfg_check_all_emails_button": {"message": "Кнопка \"Проверить все письма\""},
+    "cfg_align_title_folder": {"message": "Выравнивание заголовка папки"},
+    "cfg_custom_background": {"message": "URL настраиваемой темы фона"},
+    "cfg_transparency_topbar": {"message": "Прозрачность верхней панели"},
+    "cfg_support_rate_topbar": {"message": "Кнопка поддержки и оценки"},
+
+    "cfg_open_outlook": {"message": "Открыть Outlook"},
+    "cfg_open_calendar": {"message": "Открыть календарь"},
+
+    "cfg_new_version": {"message": "Доступна новая версия"}
+}
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "__MSG_extensionDescription__",
 
   "icons": {
diff --git a/src/outlook_web_plus.js b/src/outlook_web_plus.js
@@ -3,7 +3,6 @@ let startTimer = null;
 
 // Ads
 let hideLeftRail = true;
-let hidePremiumAd = true;
 let hideTopIcons = true;
 let hideFirstemailAd = true;
 
@@ -32,7 +31,6 @@ const start = async () => {
             updatePremiumLogo(),
             titleListener(),
             cleanFirstmailAd(),
-            cleanPremiumAd(),
             cleanTopIcons(),
             mailCalculator(),
             selectAll(),
@@ -55,10 +53,6 @@ chrome.storage.onChanged.addListener(function (changes) {
 			hideLeftRail = changes.hideLeftRail.newValue;
 			cleanLeftRail(0);
 			break;
-		case "hidePremiumAd":
-			hidePremiumAd = changes.hidePremiumAd.newValue;
-			cleanPremiumAd(0);
-			break;
 	  	case "hideTopIcons":
 			hideTopIcons = changes.hideTopIcons.newValue;
 			cleanTopIcons(0);
@@ -110,7 +104,6 @@ chrome.storage.onChanged.addListener(function (changes) {
 const loadVariables = (value) => {
 	hideFirstemailAd = value.hideFirstemailAd === undefined ? hideFirstemailAd : value.hideFirstemailAd;
 	hideLeftRail = value.hideLeftRail === undefined ? hideLeftRail : value.hideLeftRail;
-	hidePremiumAd = value.hidePremiumAd === undefined ? hidePremiumAd : value.hidePremiumAd;
 	hideTopIcons = value.hideTopIcons === undefined ? hideTopIcons : value.hideTopIcons;
 	premiumLogo = value.premiumLogo === undefined ? premiumLogo : value.premiumLogo;
 	addNumberOfEmail = value.addNumberOfEmail === undefined ? addNumberOfEmail : value.addNumberOfEmail;
@@ -127,7 +120,6 @@ const loadVariables = (value) => {
 
 	chrome.storage.local.set({
 		hideLeftRail,
-		hidePremiumAd,
 		hideFirstemailAd,
 		hideTopIcons,
 		premiumLogo,
@@ -204,20 +196,40 @@ const updatePremiumLogo = (ms = 100) => {
 }
 
 const mailCalculator = (ms = 150) => {
+	let counter = 0;
+
 	const findFolder = () => {
 		const folderTitle = document.querySelector('.jXaVF');
-		if (folderTitle) {
-			const folderTitleText = folderTitle.innerText;
-			const firstMail = document.querySelector('.jGG6V');
-			const numberOfEmails = firstMail ? firstMail.getAttribute('aria-setsize') : 0;
-			// const regex = /\s\(\d+ emails\)/; // Old Way
-			const regex = new RegExp(`\\s\\(${numberOfEmails} ${emailsText}\\)`);
+		const folderTitleText = folderTitle.innerText;
+		const emailsDetector = document.querySelectorAll('.jGG6V');
+		const emptyFolder = document.getElementById('EmptyState_MainMessage')
+
+		if (folderTitle && (emailsDetector.length > 1)){
+			const firstEmail = emailsDetector[0].getAttribute('aria-posinset') == 1 ? emailsDetector[0] : emailsDetector[1];
+
+			if (firstEmail) {
+				const numberOfEmails = firstEmail ? firstEmail.getAttribute('aria-setsize') : 0;
+				// const regex = /\s\(\d+ emails\)/; // Old Way
+				const regex = new RegExp(`\\s\\(${numberOfEmails} ${emailsText}\\)`);
+	
+				// Prevent duplication
+				if (regex.test(folderTitleText)) {
+					folderTitle.innerHTML = folderTitleText.replace(regex, `<b class="mailColor" style="color: ${numberOfEmailColor}; display: ${addNumberOfEmail ? 'inline' : 'none'}"> (${numberOfEmails} ${emailsText})</b>`);
+				} else {			    
+					folderTitle.innerHTML = `${folderTitleText} <b class="mailColor" style="color: ${numberOfEmailColor}; display: ${addNumberOfEmail ? 'inline' : 'none'}"> (${numberOfEmails} ${emailsText})</b>`;
+				}
+				clearInterval(timer);
+			}
+		}
+
+		if (counter > 100 || emptyFolder) {
+			const regex = new RegExp(`\\s\\(${0} ${emailsText}\\)`);
 
 			// Prevent duplication
 			if (regex.test(folderTitleText)) {
-				folderTitle.innerHTML = folderTitleText.replace(regex, `<b class="mailColor" style="color: ${numberOfEmailColor}; display: ${addNumberOfEmail ? 'inline' : 'none'}"> (${numberOfEmails} ${emailsText})</b>`);
+				folderTitle.innerHTML = folderTitleText.replace(regex, `<b class="mailColor" style="color: ${numberOfEmailColor}; display: ${addNumberOfEmail ? 'inline' : 'none'}"> (${0} ${emailsText})</b>`);
 			} else {			    
-				folderTitle.innerHTML = `${folderTitleText} <b class="mailColor" style="color: ${numberOfEmailColor}; display: ${addNumberOfEmail ? 'inline' : 'none'}"> (${numberOfEmails} ${emailsText})</b>`;
+				folderTitle.innerHTML = `${folderTitleText} <b class="mailColor" style="color: ${numberOfEmailColor}; display: ${addNumberOfEmail ? 'inline' : 'none'}"> (${0} ${emailsText})</b>`;
 			}
 			clearInterval(timer);
 		}
@@ -230,17 +242,6 @@ const cleanLeftRail = () => {
     leftRail.style.display = hideLeftRail ? "none" : "block";
 }
 
-const cleanPremiumAd = (ms = 100) => {
-	const findPremium = () => {
-		const premiumAd = document.querySelector(".Ogqyq");
-		if (premiumAd) {
-			premiumAd.style.display = hidePremiumAd ? "none" : "block";
-			clearInterval(timer);
-		}
-	}
-	const timer = setInterval(findPremium, ms);
-}
-
 const alignFolderTitle = (ms = 100) => {
 	const findFolderTitle = () => {
 		const folderTitle = document.querySelector(".IG8s8");
diff --git a/src/outlook_web_plus_min.js b/src/outlook_web_plus_min.js
diff --git a/src/popup.html b/src/popup.html
@@ -29,25 +29,19 @@ <h2 class="titlePopup">Outlook Web Plus<sup>+</sup></h2>
                 Ads
             </legend>
             <div class="labels">
-                <label class="ad">
-                    <input type="checkbox" id="hidepremiumadInput">
-                    <span id="hide_premium_ad_text">
-                        Hide Microsoft 365 Premium Ad
-                    </span>
-                </label>
-                <label class="ad">
+                <label class="ad" title="better performance with uBlock Origin">
                     <input type="checkbox" id="hidefirstemailadInput">
                     <span id="hide_firstemail_ad_text">
                         Hide First Email Ad
                     </span>
                 </label>
-                <label class="ad">
+                <label class="ad" title="Hide topbar useless icons">
                     <input type="checkbox" id="hidetopiconsInput">
                     <span id="hide_top_icons_text">
                         Hide Meet, Teams, OneNote icons
                     </span>
                 </label>
-                <label class="ad">
+                <label class="ad" title="Hide left rail">
                     <input type="checkbox" id="hideleftbannerInput">
                     <span id="hide_left_rail_text">
                         Hide Left Rail
diff --git a/src/popup.js b/src/popup.js
@@ -5,6 +5,7 @@ function scrapeAddonVersion(actualVersion, translatedMessage) {
         const addonData = data.results[0]["current_version"]
         const newVersion = addonData["version"]
         const newVersionUrl = addonData["file"]["url"]
+
         if (newVersion !== actualVersion) {
             document.querySelector(".linkNewVersion").style.display = "flex"
             document.querySelector(".linkNewVersion").href = newVersionUrl
@@ -65,7 +66,6 @@ const updateInputElement = (id, storageKey) => {
 window.onload = function() {
     // Updater
     updateInputElement("hideleftbannerInput", "hideLeftRail");
-    updateInputElement("hidepremiumadInput", "hidePremiumAd");
     updateInputElement("hidetopiconsInput", "hideTopIcons");
     updateInputElement("hidefirstemailadInput", "hideFirstemailAd");                        
     colorChecker();
@@ -83,7 +83,6 @@ window.onload = function() {
     // Locales
     document.getElementById("ads_title_text").textContent = chrome.i18n.getMessage("ads_text");
     document.getElementById("hide_left_rail_text").textContent = chrome.i18n.getMessage("cfg_hide_left_rail");
-    document.getElementById("hide_premium_ad_text").textContent = chrome.i18n.getMessage("cfg_hide_premium_ad");
     document.getElementById("hide_top_icons_text").textContent = chrome.i18n.getMessage("cfg_hide_top_icons");
     document.getElementById("extras_title_text").textContent = chrome.i18n.getMessage("extras_text");
     document.getElementById("outlook_logo_text").textContent = chrome.i18n.getMessage("cfg_outlook_logo");
@@ -104,5 +103,5 @@ window.onload = function() {
     scrapeAddonVersion(manifestData.version, chrome.i18n.getMessage("cfg_new_version"));
     setInterval(() => {
         scrapeAddonVersion(manifestData.version, chrome.i18n.getMessage("cfg_new_version"));
-    }, 12 * 60 * 60 * 1000); // Check every 12 hours
+    }, 12 * 60 * 60 * 1000); // Check every 12 hours if a new version is available if browser is already open
 };

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"manifest_version": 2,`
`3`	`3`	`"name": "__MSG_extensionName__",`
`4`		`- "version": "1.2.0",`
	`4`	`+ "version": "1.2.1",`
`5`	`5`	`"description": "__MSG_extensionDescription__",`
`6`	`6`
`7`	`7`	`"icons": {`