mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
removed remnants of dev branch
This commit is contained in:
parent
760c7b73ad
commit
400b14e021
@ -106,10 +106,6 @@ export default class RootCommandExecutor extends Component {
|
||||
await this.showAndHoistSubtree('_search');
|
||||
}
|
||||
|
||||
async showUserGuideCommand() {
|
||||
await this.showAndHoistSubtree('_userGuide');
|
||||
}
|
||||
|
||||
async showAndHoistSubtree(subtreeNoteId) {
|
||||
await appContext.tabManager.openContextWithNote(subtreeNoteId, {
|
||||
activate: true,
|
||||
|
@ -75,7 +75,7 @@ const TPL = `
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
body.mobile .show-user-guide-button, body.mobile .show-about-dialog-button {
|
||||
body.mobile .show-help-button, body.mobile .show-about-dialog-button {
|
||||
/* hidden because these dialogs are not available for mobile */
|
||||
display: none;
|
||||
}
|
||||
@ -195,10 +195,10 @@ const TPL = `
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li class="dropdown-item show-user-guide-button" data-trigger-command="showUserGuide">
|
||||
<li class="dropdown-item show-help-button" data-trigger-command="showHelp">
|
||||
<span class="bx bx-info-circle"></span>
|
||||
Show User Guide
|
||||
<kbd data-command="showUserGuide"></kbd>
|
||||
Show Help
|
||||
<kbd data-command="showHelp"></kbd>
|
||||
</li>
|
||||
|
||||
<li class="dropdown-item show-about-dialog-button">
|
||||
|
@ -1,3 +1,4 @@
|
||||
import utils from "../../services/utils.js";
|
||||
import BasicWidget from "../basic_widget.js";
|
||||
|
||||
const TPL = `
|
||||
@ -155,4 +156,8 @@ export default class HelpDialog extends BasicWidget {
|
||||
doRender() {
|
||||
this.$widget = $(TPL);
|
||||
}
|
||||
|
||||
showHelpEvent() {
|
||||
utils.openDialog(this.$widget);
|
||||
}
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
|
||||
|
||||
const files = [...e.originalEvent.dataTransfer.files]; // chrome has issue that dataTransfer.files empties after async operation
|
||||
|
||||
const importService = await import("../services/import");
|
||||
const importService = await import("../services/import.js");
|
||||
|
||||
importService.uploadFiles(activeNote.noteId, files, {
|
||||
safeImport: true,
|
||||
|
@ -72,12 +72,6 @@ const HIDDEN_SUBTREE_DEFINITION = {
|
||||
{ type: 'label', name: 'keepCurrentHoisting' }
|
||||
]
|
||||
},
|
||||
{
|
||||
id: '_userGuide',
|
||||
title: 'User Guide',
|
||||
type: 'text',
|
||||
icon: 'bx-help-circle'
|
||||
},
|
||||
{
|
||||
// place for user scripts hidden stuff (scripts should not create notes directly under hidden root)
|
||||
id: '_userHidden',
|
||||
|
@ -273,7 +273,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
|
||||
scope: "window"
|
||||
},
|
||||
{
|
||||
actionName: "showUserGuide",
|
||||
actionName: "showHelp",
|
||||
defaultShortcuts: ["F1"],
|
||||
description: "Shows built-in Help / cheatsheet",
|
||||
scope: "window"
|
||||
|
@ -89,7 +89,6 @@ const defaultOptions = [
|
||||
{ name: 'minTocHeadings', value: '5', isSynced: true },
|
||||
{ name: 'checkForUpdates', value: 'true', isSynced: true },
|
||||
{ name: 'disableTray', value: 'false', isSynced: false },
|
||||
{ name: 'userGuideSha256Hash', value: '', isSynced: true },
|
||||
];
|
||||
|
||||
function initStartupOptions() {
|
||||
|
@ -20,12 +20,9 @@ if (!fs.existsSync(MIGRATIONS_DIR)) {
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const USER_GUIDE_ZIP_DIR = path.resolve(RESOURCE_DIR, "tmp");
|
||||
|
||||
module.exports = {
|
||||
RESOURCE_DIR,
|
||||
MIGRATIONS_DIR,
|
||||
DB_INIT_DIR,
|
||||
ELECTRON_APP_ROOT_DIR,
|
||||
USER_GUIDE_ZIP_DIR
|
||||
ELECTRON_APP_ROOT_DIR
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user