Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2025-11-08 14:26:12 +01:00
Code Issues Packages Projects Releases Activity

Rename methods

Browse Source
This commit is contained in:
Ximi1970
2021-08-10 20:13:33 +02:00
parent ad664153cc
commit cd6d611091
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webext/background.js
View File

@@ -108,7 +108,7 @@ SysTrayX.Messaging = {
listenerFolderCreated: function (createdFolder) { listenerFolderCreated: function (createdFolder) {
console.debug("Folder created: " + JSON.stringify(createdFolder)); console.debug("Folder created: " + JSON.stringify(createdFolder));
const found = isParentFilteredFolder(createdFolder); const found = isParentFolderInFilters(createdFolder);
if (found) { if (found) {
addFolderToFilters(createdFolder); addFolderToFilters(createdFolder);
} }
@@ -117,12 +117,19 @@ SysTrayX.Messaging = {
listenerFolderRenamed: function (originalFolder, renameFolder) { listenerFolderRenamed: function (originalFolder, renameFolder) {
console.debug("Folder renamed from: " + JSON.stringify(originalFolder)); console.debug("Folder renamed from: " + JSON.stringify(originalFolder));
console.debug("Folder renamed to: " + JSON.stringify(renameFolder)); console.debug("Folder renamed to: " + JSON.stringify(renameFolder));
deleteFolderFromFilters(originalFolder);
const found = isParentFolderInFilters(renameFolder);
if (found) {
addFolderToFilters(renameFolder);
}
}, },
listenerFolderDeleted: function (deletedFolder) { listenerFolderDeleted: function (deletedFolder) {
console.debug("Folder deleted: " + JSON.stringify(deletedFolder)); console.debug("Folder deleted: " + JSON.stringify(deletedFolder));
deleteFilteredFolder(deletedFolder); deleteFolderFromFilters(deletedFolder);
}, },
listenerFolderInfoChanged: function (folder, folderInfo) { listenerFolderInfoChanged: function (folder, folderInfo) {

12
webext/js/defaults.js
View File

@@ -507,7 +507,7 @@ async function getCloseType() {
// Helper funcs for TB91 and later folder handling // Helper funcs for TB91 and later folder handling
// Check if a folder is in the filter list // Check if a folder is in the filter list
function isFilteredFolder(folder) { function isFolderInFilters(folder) {
return ( return (
SysTrayX.Messaging.filters.filter( SysTrayX.Messaging.filters.filter(
(filter) => (filter) =>
@@ -519,7 +519,7 @@ function isFilteredFolder(folder) {
} }
// Check if the parent folder of a folder is in the filter list // Check if the parent folder of a folder is in the filter list
function isParentFilteredFolder(folder) { function isParentFolderInFilters(folder) {
const parentPath = folder.path.substring(0, folder.path.lastIndexOf("/")); const parentPath = folder.path.substring(0, folder.path.lastIndexOf("/"));
return ( return (
@@ -533,13 +533,13 @@ function isParentFilteredFolder(folder) {
} }
// Delete a folder from the filter list // Delete a folder from the filter list
function deleteFilteredFolder(deleteFolder) { function deleteFolderFromFilters(folder) {
const newFilters = SysTrayX.Messaging.filters.filter( const newFilters = SysTrayX.Messaging.filters.filter(
(filter) => (filter) =>
!( !(
filter.folder.accountId === deleteFolder.accountId && filter.folder.accountId === folder.accountId &&
(filter.folder.path === deleteFolder.path || (filter.folder.path === folder.path ||
filter.folder.path.toUpperCase() === deleteFolder.path) filter.folder.path.toUpperCase() === folder.path)
) )
); );