Cleanup function folderListOptionsBuilder()

This commit is contained in:
djmaze 2021-03-23 22:45:30 +01:00
parent 36b66c3ec5
commit 650e962fdf
4 changed files with 37 additions and 55 deletions

View file

@ -23,19 +23,19 @@ class FolderCreatePopupView extends AbstractViewPopup {
selectedParentValue: UNUSED_OPTION_VALUE
});
this.parentFolderSelectList = ko.computed(() => {
const top = [],
list = FolderUserStore.folderList(),
fDisableCallback = FolderUserStore.namespace
this.parentFolderSelectList = ko.computed(() =>
folderListOptionsBuilder(
[],
FolderUserStore.folderList(),
[],
[['', '']],
FolderUserStore.namespace
? item => FolderUserStore.namespace !== item.fullNameRaw.substr(0, FolderUserStore.namespace.length)
: null,
fRenameCallback = oItem =>
oItem ? (oItem.isSystemFolder() ? oItem.name() + ' ' + oItem.manageFolderSystemName() : oItem.name()) : '';
top.push(['', '']);
return folderListOptionsBuilder([], list, [], top, null, fDisableCallback, null, fRenameCallback);
});
oItem =>
oItem ? (oItem.isSystemFolder() ? oItem.name() + ' ' + oItem.manageFolderSystemName() : oItem.name()) : ''
)
);
this.defaultOptionsAfterRender = defaultOptionsAfterRender;

View file

@ -39,8 +39,6 @@ class FolderSystemPopupView extends AbstractViewPopup {
null,
null,
null,
null,
null,
true
)
);