Merge branch 'master' into 74-integration-with-bookmarks-core-plugin
This commit is contained in:
commit
0031ee3a83
|
@ -573,13 +573,14 @@ export const determineFolderDatesIfNeeded = (folderItems: Array<FolderItemForSor
|
|||
const Now: number = Date.now()
|
||||
folderItems.forEach((item) => {
|
||||
if (item.folder) {
|
||||
const folderDefaultSortRequiresFolderDate: boolean = !!(sortingSpec.defaultOrder && sortOrderNeedsFolderDates(sortingSpec.defaultOrder))
|
||||
const folderDefaultSortRequiresFolderDate: boolean = !!(sortingSpec.defaultOrder && sortOrderNeedsFolderDates(sortingSpec.defaultOrder, sortingSpec.defaultSecondaryOrder))
|
||||
let groupSortRequiresFolderDate: boolean = false
|
||||
if (!folderDefaultSortRequiresFolderDate) {
|
||||
const groupIdx: number | undefined = item.groupIdx
|
||||
if (groupIdx !== undefined) {
|
||||
const groupOrder: CustomSortOrder | undefined = sortingSpec.groups[groupIdx].order
|
||||
groupSortRequiresFolderDate = !!groupOrder && sortOrderNeedsFolderDates(groupOrder)
|
||||
const groupSecondaryOrder: CustomSortOrder | undefined = sortingSpec.groups[groupIdx].secondaryOrder
|
||||
groupSortRequiresFolderDate = !!groupOrder && sortOrderNeedsFolderDates(groupOrder, groupSecondaryOrder)
|
||||
}
|
||||
}
|
||||
if (folderDefaultSortRequiresFolderDate || groupSortRequiresFolderDate) {
|
||||
|
|
|
@ -532,7 +532,7 @@ class CustomSortSettingTab extends PluginSettingTab {
|
|||
|
||||
containerEl.empty();
|
||||
|
||||
containerEl.createEl('h2', {text: 'Settings for Custom File Explorer Sorting Plugin'});
|
||||
// containerEl.createEl('h2', {text: 'Settings for Custom File Explorer Sorting Plugin'});
|
||||
|
||||
const additionalSortspecFileDescr: DocumentFragment = sanitizeHTMLToDom(
|
||||
'A note name or note path to scan (YAML frontmatter) for sorting specification in addition to the `sortspec` notes and Folder Notes<sup><b>*</b></sup>.'
|
||||
|
|
Loading…
Reference in New Issue