Cleanup function folderListOptionsBuilder()

dev/Common/UtilsUser.js

@@ -216,9 +216,7 @@ rl.Utils = {
  * @param {Array} aList
  * @param {Array=} aDisabled
  * @param {Array=} aHeaderLines
- * @param {?number=} iUnDeep
  * @param {Function=} fDisableCallback
- * @param {Function=} fVisibleCallback
  * @param {Function=} fRenameCallback
  * @param {boolean=} bSystem
  * @param {boolean=} bBuildUnvisible
@@ -229,9 +227,7 @@ export function folderListOptionsBuilder(
 	aList,
 	aDisabled,
 	aHeaderLines,
-	iUnDeep,
 	fDisableCallback,
-	fVisibleCallback,
 	fRenameCallback,
 	bSystem,
 	bBuildUnvisible
@@ -246,9 +242,7 @@ export function folderListOptionsBuilder(
 
 	bBuildUnvisible = undefined === bBuildUnvisible ? false : !!bBuildUnvisible;
 	bSystem = null == bSystem ? 0 < aSystem.length : bSystem;
-	iUnDeep = null == iUnDeep ? 0 : iUnDeep;
 	fDisableCallback = null != fDisableCallback ? fDisableCallback : null;
-	fVisibleCallback = null != fVisibleCallback ? fVisibleCallback : null;
 	fRenameCallback = null != fRenameCallback ? fRenameCallback : null;
 
 	if (!isArray(aDisabled)) {
@@ -271,7 +265,6 @@ export function folderListOptionsBuilder(
 
 	bSep = true;
 	aSystem.forEach(oItem => {
-		if (fVisibleCallback ? fVisibleCallback(oItem) : true) {
 		aResult.push({
 			id: oItem.fullNameRaw,
 			name: fRenameCallback ? fRenameCallback(oItem) : oItem.name(),
@@ -283,7 +276,6 @@ export function folderListOptionsBuilder(
 				(fDisableCallback ? fDisableCallback(oItem) : false)
 		});
 		bSep = false;
-		}
 	});
 
 	bSep = true;
@@ -293,12 +285,11 @@ export function folderListOptionsBuilder(
 			(oItem.subscribed() || !oItem.exists || bBuildUnvisible) &&
 			(oItem.selectable || oItem.hasSubscribedSubfolders())
 		) {
-			if (fVisibleCallback ? fVisibleCallback(oItem) : true) {
 			if (FolderType.User === oItem.type() || !bSystem || oItem.hasSubscribedSubfolders()) {
 				aResult.push({
 					id: oItem.fullNameRaw,
 					name:
-							new Array(oItem.deep + 1 - iUnDeep).join(sDeepPrefix) +
+						sDeepPrefix.repeat(oItem.deep + 1) +
 						(fRenameCallback ? fRenameCallback(oItem) : oItem.name()),
 					system: false,
 					dividerbar: bSep,
@@ -310,7 +301,6 @@ export function folderListOptionsBuilder(
 				bSep = false;
 			}
 		}
-		}
 
 		if (oItem.subscribed() && oItem.subFolders.length) {
 			aResult = aResult.concat(
@@ -319,9 +309,7 @@ export function folderListOptionsBuilder(
 					oItem.subFolders(),
 					aDisabled,
 					[],
-					iUnDeep,
 					fDisableCallback,
-					fVisibleCallback,
 					fRenameCallback,
 					bSystem,
 					bBuildUnvisible

dev/Stores/User/Folder.js

@@ -104,9 +104,7 @@ export const FolderUserStore = new class {
 				this.folderListSystem(),
 				this.folderList(),
 				[this.currentFolderFullNameRaw()],
-				null,
+				[],
-				null,
-				null,
 				null,
 				(item) => (item ? item.localName() : '')
 			)
@@ -119,8 +117,6 @@ export const FolderUserStore = new class {
 				[this.sieveAllowFileintoInbox ? '' : 'INBOX'],
 				[['', '']],
 				null,
-				null,
-				null,
 				(item) => (item ? item.localName() : '')
 			)
 		);

dev/View/Popup/FolderCreate.js

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

dev/View/Popup/FolderSystem.js

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