diff --git a/src/public/app/entities/fnote.ts b/src/public/app/entities/fnote.ts index 6f4a58005..0fd19fff5 100644 --- a/src/public/app/entities/fnote.ts +++ b/src/public/app/entities/fnote.ts @@ -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() { diff --git a/src/public/app/services/branches.ts b/src/public/app/services/branches.ts index 9c2e66b1a..27884e77e 100644 --- a/src/public/app/services/branches.ts +++ b/src/public/app/services/branches.ts @@ -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; } diff --git a/src/public/app/services/utils.ts b/src/public/app/services/utils.ts index ba056e102..cad99c956 100644 --- a/src/public/app/services/utils.ts +++ b/src/public/app/services/utils.ts @@ -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 }; diff --git a/src/public/app/widgets/note_title.js b/src/public/app/widgets/note_title.js index ff943ac1a..d18692228 100644 --- a/src/public/app/widgets/note_title.js +++ b/src/public/app/widgets/note_title.js @@ -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 = `