Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update JavaScrip files to make select folder work in User Preferences RE: 277 #282

Open
wants to merge 2 commits into
base: hotfix
Choose a base branch
from
Open

Update JavaScrip files to make select folder work in User Preferences RE: 277 #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83621ce
Update EmailUI.js
pstevens71 Jun 7, 2023
c799a52
Update ajax.js
pstevens71 Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions public/legacy/modules/Emails/javascript/EmailUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2792,22 +2792,20 @@

select = document.getElementById('userFolders');

var selectedSubscriptions = [];

for (i = 0; i < select.options.length; i++) {
var opt = select.options[i];
if (opt.selected && opt.value != "") {
if (active != "") {
active += "::";
if (opt.selected && opt.value !== "") {
if (!selectedSubscriptions.includes(opt.value)) {
selectedSubscriptions.push(opt.value);
}
active += opt.value;
}
}

//Add the group folder ids.
var group_folders = SUGAR.email2.folders.retrieveGroupFolderSubscriptions();
for (i = 0; i < group_folders.length; i++) {
active += ("::" + group_folders[i]);
}


active = selectedSubscriptions.join("::");


AjaxObject.startRequest(callbackFolderSubscriptions, urlStandard + '&emailUIAction=updateSubscriptions&subscriptions=' + active);
},
/**
Expand Down
31 changes: 27 additions & 4 deletions public/legacy/modules/Emails/javascript/ajax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,17 +381,40 @@ var AjaxObject = {
//SUGAR.email2.accounts.rebuildFolderList(); // refresh frameFolder
var ret = YAHOO.lang.JSON.parse(o.responseText);
var user = document.getElementById('userFolders');

var userFolders = ret.userFolders;
var groupFolders = ret.groupFolders;
// Store the currently selected options
var selectedOptions = Array.from(user.selectedOptions).map(function(option) {
return option.value;
});
// Clear the select element
SUGAR.email2.util.emptySelectOptions(user);

// Process userFolders array
for (i = 0; i < ret.userFolders.length; i++) {
var display = ret.userFolders[i].name;
var value = ret.userFolders[i].id;
var selected = (ret.userFolders[i].selected != "") ? true : false;
var folder = userFolders[i];
var display = folder.name;
var value = folder.id;
var selected = selectedOptions.includes(value);
var opt = new Option(display, value, selected);
opt.selected = selected;
user.options.add(opt);
}
// Process groupFolders array, excluding the "--None--" option
for (var j = 0; j < groupFolders.length; j++) {
var groupFolder = groupFolders[j];

if (groupFolder.name === "--None--") {
continue; // Skip the "--None--" option
}

var groupFolderDisplay = groupFolder.name;
var groupFolderValue = groupFolder.id;
var groupFolderSelected = selectedOptions.includes(groupFolderValue);
var groupFolderOpt = new Option(groupFolderDisplay, groupFolderValue, groupFolderSelected);
groupFolderOpt.selected = groupFolderSelected;
user.options.add(groupFolderOpt);
}
},

/**
Expand Down