renamed variable allTabsdata to tabsData

extension/core/bg/autosave.js

@@ -69,11 +69,10 @@ singlefile.extension.core.bg.autosave = (() => {
 	async function isEnabled(tab) {
 		const config = singlefile.extension.core.bg.config;
 		if (tab) {
-			const [allTabsData, rule] = await Promise.all([singlefile.extension.core.bg.tabsData.get(), config.getRule(tab.url)]);
-			return singlefile.extension.core.bg.util.isAllowedURL(tab.url) &&
-				Boolean(allTabsData.autoSaveAll ||
-					(allTabsData.autoSaveUnpinned && !tab.pinned) ||
-					(allTabsData[tab.id] && allTabsData[tab.id].autoSave)) &&
+			const [tabsData, rule] = await Promise.all([singlefile.extension.core.bg.tabsData.get(), config.getRule(tab.url)]);
+			return Boolean(tabsData.autoSaveAll ||
+				(tabsData.autoSaveUnpinned && !tab.pinned) ||
+				(tabsData[tab.id] && tabsData[tab.id].autoSave)) &&
 				(!rule || rule.autoSaveProfile != config.DISABLED_PROFILE_NAME);
 		}
 	}

extension/core/bg/config.js

@@ -221,8 +221,8 @@ singlefile.extension.core.bg.config = (() => {
 	}
 
 	async function getOptions(url, autoSave) {
-		const [config, rule, allTabsData] = await Promise.all([getConfig(), getRule(url), singlefile.extension.core.bg.tabsData.get()]);
-		const tabProfileName = allTabsData.profileName || DEFAULT_PROFILE_NAME;
+		const [config, rule, tabsData] = await Promise.all([getConfig(), getRule(url), singlefile.extension.core.bg.tabsData.get()]);
+		const tabProfileName = tabsData.profileName || DEFAULT_PROFILE_NAME;
 		if (rule) {
 			const profileName = rule[autoSave ? "autoSaveProfile" : "profile"];
 			return config.profiles[profileName == CURRENT_PROFILE_NAME ? tabProfileName : profileName];
@@ -241,8 +241,7 @@ singlefile.extension.core.bg.config = (() => {
 	}
 
 	async function renameProfile(oldProfileName, profileName) {
-		const tabsData = singlefile.extension.core.bg.tabsData;
-		const [config, allTabsData] = await Promise.all([getConfig(), tabsData.get()]);
+		const [config, tabsData] = await Promise.all([getConfig(), singlefile.extension.core.bg.tabsData.get()]);
 		if (!Object.keys(config.profiles).includes(oldProfileName)) {
 			throw new Error("Profile not found");
 		}
@@ -252,9 +251,9 @@ singlefile.extension.core.bg.config = (() => {
 		if (oldProfileName == DEFAULT_PROFILE_NAME) {
 			throw new Error("Default settings cannot be renamed");
 		}
-		if (allTabsData.profileName == oldProfileName) {
-			allTabsData.profileName = profileName;
-			await tabsData.set(allTabsData);
+		if (tabsData.profileName == oldProfileName) {
+			tabsData.profileName = profileName;
+			await singlefile.extension.core.bg.tabsData.set(tabsData);
 		}
 		config.profiles[profileName] = config.profiles[oldProfileName];
 		config.rules.forEach(rule => {
@@ -270,17 +269,16 @@ singlefile.extension.core.bg.config = (() => {
 	}
 
 	async function deleteProfile(profileName) {
-		const tabsData = singlefile.extension.core.bg.tabsData;
-		const [config, allTabsData] = await Promise.all([getConfig(), tabsData.get()]);
+		const [config, tabsData] = await Promise.all([getConfig(), singlefile.extension.core.bg.tabsData.get()]);
 		if (!Object.keys(config.profiles).includes(profileName)) {
 			throw new Error("Profile not found");
 		}
 		if (profileName == DEFAULT_PROFILE_NAME) {
 			throw new Error("Default settings cannot be deleted");
 		}
-		if (allTabsData.profileName == profileName) {
-			delete allTabsData.profileName;
-			await tabsData.set(allTabsData);
+		if (tabsData.profileName == profileName) {
+			delete tabsData.profileName;
+			await singlefile.extension.core.bg.tabsData.set(tabsData);
 		}
 		config.rules.forEach(rule => {
 			if (rule.profile == profileName) {
@@ -349,11 +347,10 @@ singlefile.extension.core.bg.config = (() => {
 	}
 
 	async function resetProfiles() {
-		const tabsData = singlefile.extension.core.bg.tabsData;
 		await pendingUpgradePromise;
-		const allTabsData = await tabsData.get();
-		delete allTabsData.profileName;
-		await tabsData.set(allTabsData);
+		const tabsData = await singlefile.extension.core.bg.tabsData.get();
+		delete tabsData.profileName;
+		await singlefile.extension.core.bg.tabsData.set(tabsData);
 		await browser.storage.local.remove(["profiles", "rules", "maxParallelWorkers"]);
 		await upgrade();
 	}

extension/core/bg/tabs-data.js

@@ -26,7 +26,7 @@
 singlefile.extension.core.bg.tabsData = (() => {
 
 	let persistentData, temporaryData, cleanedUp;
-	setTimeout(() => getPersistent().then(allTabsData => persistentData = allTabsData), 0);
+	setTimeout(() => getPersistent().then(tabsData => persistentData = tabsData), 0);
 	return {
 		onMessage,
 		onTabRemoved,
@@ -48,9 +48,9 @@ singlefile.extension.core.bg.tabsData = (() => {
 		if (temporaryData) {
 			delete temporaryData[tabId];
 		}
-		const allTabsData = await getPersistent();
-		delete allTabsData[tabId];
-		setPersistent(allTabsData);
+		const tabsData = await getPersistent();
+		delete tabsData[tabId];
+		setPersistent(tabsData);
 	}
 
 	function getTemporary(desiredTabId) {
@@ -75,9 +75,9 @@ singlefile.extension.core.bg.tabsData = (() => {
 		return persistentData;
 	}
 
-	async function setPersistent(allTabsData) {
-		persistentData = allTabsData;
-		await browser.storage.local.set({ tabsData: allTabsData });
+	async function setPersistent(tabsData) {
+		persistentData = tabsData;
+		await browser.storage.local.set({ tabsData });
 	}
 
 	async function cleanup() {

extension/ui/bg/ui-menu.js

@@ -88,8 +88,7 @@ singlefile.extension.ui.bg.menu = (() => {
 
 	async function createMenus(tab) {
 		const config = singlefile.extension.core.bg.config;
-		const tabsData = singlefile.extension.core.bg.tabsData;
-		const [profiles, allTabsData] = await Promise.all([config.getProfiles(), tabsData.get()]);
+		const [profiles, tabsData] = await Promise.all([config.getProfiles(), singlefile.extension.core.bg.tabsData.get()]);
 		const options = await config.getOptions(tab && tab.url, true);
 		if (BROWSER_MENUS_API_SUPPORTED && options) {
 			const pageContextsEnabled = ["page", "frame", "image", "link", "video", "audio", "selection"];
@@ -186,7 +185,7 @@ singlefile.extension.ui.bg.menu = (() => {
 					contexts: defaultContexts,
 				});
 				const defaultProfileId = MENU_ID_SELECT_PROFILE_PREFIX + "default";
-				const defaultProfileChecked = !allTabsData.profileName || allTabsData.profileName == config.DEFAULT_PROFILE_NAME;
+				const defaultProfileChecked = !tabsData.profileName || tabsData.profileName == config.DEFAULT_PROFILE_NAME;
 				menus.create({
 					id: defaultProfileId,
 					type: "radio",
@@ -233,7 +232,7 @@ singlefile.extension.ui.bg.menu = (() => {
 				Object.keys(profiles).forEach((profileName, profileIndex) => {
 					if (profileName != config.DEFAULT_PROFILE_NAME) {
 						let profileId = MENU_ID_SELECT_PROFILE_PREFIX + profileIndex;
-						let profileChecked = allTabsData.profileName == profileName;
+						let profileChecked = tabsData.profileName == profileName;
 						menus.create({
 							id: profileId,
 							type: "radio",

extension/ui/bg/ui-options.js

@@ -345,9 +345,9 @@
 			if (target == profileNamesInput) {
 				await refresh(profileNamesInput.value);
 				if (sidePanelDisplay) {
-					const allTabsData = await browser.runtime.sendMessage({ method: "tabsData.get" });
-					allTabsData.profileName = profileNamesInput.value;
-					await browser.runtime.sendMessage({ method: "tabsData.set", tabsData: allTabsData });
+					const tabsData = await browser.runtime.sendMessage({ method: "tabsData.get" });
+					tabsData.profileName = profileNamesInput.value;
+					await browser.runtime.sendMessage({ method: "tabsData.set", tabsData: tabsData });
 					await browser.runtime.sendMessage({ method: "ui.refreshMenu" });
 				}
 			} else {
@@ -435,8 +435,8 @@
 		sidePanelDisplay = true;
 		document.querySelector(".options-title").remove();
 		document.documentElement.classList.add("side-panel");
-		const allTabsData = await browser.runtime.sendMessage({ method: "tabsData.get" });
-		refresh(allTabsData.profileName);
+		const tabsData = await browser.runtime.sendMessage({ method: "tabsData.get" });
+		refresh(tabsData.profileName);
 	} else {
 		refresh();
 	}