Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 21:19:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent memory leaks in *Model

Browse source
This commit is contained in:
djmaze 2020-10-25 11:46:58 +01:00
parent 48a9a03762
commit d7a4639d6b
22 changed files with 221 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dev/View/Popup/Contacts.js
View file

@ -55,10 +55,9 @@ class ContactsPopupView extends AbstractViewNext {
this.importUploaderButton = ko.observable(null);
this.contactsPage = ko.observable(1);
this.contactsPageCount = ko.computed(() => {
const iPage = Math.ceil(this.contactsCount() / CONTACTS_PER_PAGE);
return 0 >= iPage ? 1 : iPage;
});
this.contactsPageCount = ko.computed(() =>
Math.max(1, Math.ceil(this.contactsCount() / CONTACTS_PER_PAGE))
);
this.contactsPaginator = ko.computed(computedPaginatorHelper(this.contactsPage, this.contactsPageCount));
@ -104,10 +103,7 @@ class ContactsPopupView extends AbstractViewNext {
this.viewPropertiesNames().filter(property => !!trim(property.value()))
);
const propertyFocused = (property) => {
const focused = property.focused();
return !trim(property.value()) && !focused;
};
const propertyFocused = property => !trim(property.value()) && !property.focused();
this.viewPropertiesEmailsEmptyAndOnFocused = ko.computed(() =>
this.viewPropertiesEmails().filter(propertyFocused)
@ -117,7 +113,9 @@ class ContactsPopupView extends AbstractViewNext {
this.viewPropertiesPhones().filter(propertyFocused)
);
this.viewPropertiesWebEmptyAndOnFocused = ko.computed(() => this.viewPropertiesWeb().filter(propertyFocused));
this.viewPropertiesWebEmptyAndOnFocused = ko.computed(() =>
this.viewPropertiesWeb().filter(propertyFocused)
);
this.viewPropertiesOtherEmptyAndOnFocused = ko.computed(() =>
this.viewPropertiesOther().filter(propertyFocused)
@ -141,9 +139,7 @@ class ContactsPopupView extends AbstractViewNext {
this.useCheckboxesInList = SettingsStore.useCheckboxesInList;
this.search.subscribe(() => {
this.reloadContactList();
});
this.search.subscribe(() => this.reloadContactList());
this.contactsChecked = ko.computed(() => this.contacts().filter(item => item.checked()));
@ -170,14 +166,14 @@ class ContactsPopupView extends AbstractViewNext {
'.e-contact-item.focused'
);
this.selector.on('onItemSelect', (contact) => {
this.populateViewContact(contact ? contact : null);
this.selector.on('onItemSelect', contact => {
this.populateViewContact(contact || null);
if (!contact) {
this.emptySelection(true);
}
});
this.selector.on('onItemGetUid', (contact) => (contact ? contact.generateUid() : ''));
this.selector.on('onItemGetUid', contact => contact ? contact.generateUid() : '');
this.bDropPageAfterDelete = false;

6
dev/View/Popup/Filter.js
View file

@ -33,7 +33,7 @@ class FilterPopupView extends AbstractViewNext {
this.selectedFolderValue.subscribe(() => {
if (this.filter()) {
this.filter().actionValue.error(false);
this.filter().actionValueError(false);
}
});
@ -157,13 +157,13 @@ class FilterPopupView extends AbstractViewNext {
this.isNew(!bEdit);
if (!bEdit && oFilter) {
oFilter.name.focused(true);
oFilter.nameFocused(true);
}
}
onShowWithDelay() {
if (this.isNew() && this.filter()/* && !rl.settings.app('mobile')*/) {
this.filter().name.focused(true);
this.filter().nameFocused(true);
}
}
}