Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

refactor(client): use common method for checking if launch bar config

Browse Source
This commit is contained in:
Elian Doran
2025-01-04 21:52:41 +02:00
parent cfeb4eb51f
commit c2315a9341
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/app/entities/fnote.ts
View File

@@ -7,6 +7,7 @@ import cssClassManager from "../services/css_class_manager.js";
import { Froca } from '../services/froca-interface.js';
import FAttachment from './fattachment.js';
import FAttribute, { AttributeType } from './fattribute.js';
import utils from '../services/utils.js';
const LABEL = 'label';
const RELATION = 'relation';
@@ -983,7 +984,7 @@ class FNote {
}
isLaunchBarConfig() {
return this.type === 'launcher' || ['_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers', "_lbMobileRoot", "_lbMobileAvailableLaunchers", "_lbMobileVisibleLaunchers" ].includes(this.noteId);
return this.type === 'launcher' || utils.isLaunchBarConfig(this.noteId);
}
isOptions() {

2
src/public/app/services/branches.ts
View File

@@ -24,7 +24,7 @@ async function moveBeforeBranch(branchIdsToMove: string[], beforeBranchId: strin
return;
}
if (['root', '_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers', "_lbMobileRoot", "_lbMobileAvailableLaunchers", "_lbMobileVisibleLaunchers" ].includes(beforeBranch.noteId)) {
if (beforeBranch.noteId === "root" || utils.isLaunchBarConfig(beforeBranch.noteId)) {
toastService.showError(t("branches.cannot-move-notes-here"));
return;
}

10
src/public/app/services/utils.ts
View File

@@ -590,6 +590,13 @@ function isUpdateAvailable(latestVersion: string, currentVersion: string): boole
return compareVersions(latestVersion, currentVersion) > 0;
}
function isLaunchBarConfig(noteId: string) {
return [
"_lbRoot", "_lbAvailableLaunchers", "_lbVisibleLaunchers",
"_lbMobileRoot", "_lbMobileAvailableLaunchers", "_lbMobileVisibleLaunchers"
].includes(noteId);
}
export default {
reloadFrontendApp,
parseDate,
@@ -632,5 +639,6 @@ export default {
createImageSrcUrl,
downloadSvg,
compareVersions,
isUpdateAvailable
isUpdateAvailable,
isLaunchBarConfig
};

3
src/public/app/widgets/note_title.js
View File

@@ -6,6 +6,7 @@ import SpacedUpdate from "../services/spaced_update.js";
import appContext from "../components/app_context.js";
import branchService from "../services/branches.js";
import shortcutService from "../services/shortcuts.js";
import utils from "../services/utils.js";
const TPL = `
<div class="note-title-widget">
@@ -73,7 +74,7 @@ export default class NoteTitleWidget extends NoteContextAwareWidget {
async refreshWithNote(note) {
const isReadOnly = (note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable())
|| ['_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers', "_lbMobileRoot", "_lbMobileAvailableLaunchers", "_lbMobileVisibleLaunchers" ].includes(note.noteId)
|| utils.isLaunchBarConfig(note.noteId)
|| this.noteContext.viewScope.viewMode !== 'default';
this.$noteTitle.val(

3
src/public/app/widgets/note_tree.js
View File

@@ -392,7 +392,8 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
autoExpandMS: 600,
preventLazyParents: false,
dragStart: (node, data) => {
if (['root', '_hidden', '_lbRoot', '_lbAvailableLaunchers', '_lbVisibleLaunchers', "_lbMobileRoot", "_lbMobileAvailableLaunchers", "_lbMobileVisibleLaunchers" ].includes(node.data.noteId)
if (node.data.noteId === "root"
|| utils.isLaunchBarConfig(node.data.noteId)
|| node.data.noteId.startsWith("_options")) {
return false;
}