tpl
/
obsidian-sample-plugin
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 74-integration-with-bookmarks-core-plugin

This commit is contained in:
SebastianMC 2023-09-26 19:49:38 +02:00
parent e866023bbf 1811878249
commit 0031ee3a83
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/custom-sort/custom-sort.ts
View File

@ -573,13 +573,14 @@ export const determineFolderDatesIfNeeded = (folderItems: Array<FolderItemForSor
const Now: number = Date.now() const Now: number = Date.now()
folderItems.forEach((item) => { folderItems.forEach((item) => {
if (item.folder) { 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 let groupSortRequiresFolderDate: boolean = false
if (!folderDefaultSortRequiresFolderDate) { if (!folderDefaultSortRequiresFolderDate) {
const groupIdx: number | undefined = item.groupIdx const groupIdx: number | undefined = item.groupIdx
if (groupIdx !== undefined) { if (groupIdx !== undefined) {
const groupOrder: CustomSortOrder | undefined = sortingSpec.groups[groupIdx].order 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) { if (folderDefaultSortRequiresFolderDate || groupSortRequiresFolderDate) {

2
src/main.ts
View File

@ -532,7 +532,7 @@ class CustomSortSettingTab extends PluginSettingTab {
containerEl.empty(); 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( 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>.' '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>.'