diff --git a/images/icon-black.svg b/images/icon-black.svg index 36cc714bd..f710dce46 100644 --- a/images/icon-black.svg +++ b/images/icon-black.svg @@ -1,5 +1,5 @@ - TrilliumNext Notes + TriliumNext Notes \ No newline at end of file diff --git a/images/icon-color.svg b/images/icon-color.svg index 8e33632d2..173712891 100644 --- a/images/icon-color.svg +++ b/images/icon-color.svg @@ -1,6 +1,6 @@ - TrilliumNext Notes + TriliumNext Notes

A diff:

+ 
Hello
+            -world
+            +worldy
+
`; + const expected = trimIndentation`\ + A diff: + + \`\`\`diff + Hello + -world + +worldy + + \`\`\``; + + expect(markdownExportService.toMarkdown(html)).toBe(expected); + }); + + it("removes auto tag for code blocks", () => { + const html = trimIndentation`\ + 
Hello
+            -world
+            +worldy
+
`; + const expected = trimIndentation`\ + \`\`\` + Hello + -world + +worldy + + \`\`\``; + + expect(markdownExportService.toMarkdown(html)).toBe(expected); + }); + + it("supports code block with no language tag", () => { + const html = trimIndentation`\ + 
Hello
`; + const expected = trimIndentation`\ + \`\`\` + Hello + \`\`\``; + + expect(markdownExportService.toMarkdown(html)).toBe(expected); + }); +}); \ No newline at end of file diff --git a/spec/support/utils.spec.ts b/spec/support/utils.spec.ts new file mode 100644 index 000000000..3c3b2ce80 --- /dev/null +++ b/spec/support/utils.spec.ts @@ -0,0 +1,14 @@ +import { trimIndentation } from "./utils.js"; + +describe("Utils", () => { + it("trims indentation", () => { + expect(trimIndentation`\ + Hello + world + 123` + ).toBe(`\ +Hello + world +123`); + }); +}); \ No newline at end of file diff --git a/spec/support/utils.ts b/spec/support/utils.ts new file mode 100644 index 000000000..849cfe840 --- /dev/null +++ b/spec/support/utils.ts @@ -0,0 +1,21 @@ +export function trimIndentation(strings: TemplateStringsArray) { + const str = strings.toString(); + + // Count the number of spaces on the first line. + let numSpaces = 0; + while (str.charAt(numSpaces) == ' ' && numSpaces < str.length) { + numSpaces++; + } + + // Trim the indentation of the first line in all the lines. + const lines = str.split("\n"); + const output = []; + for (let i=0; i { /** @returns true if the note has string content (not binary) */ hasStringContent(): boolean { - return this.type !== undefined && utils.isStringNote(this.type, this.mime); + return utils.isStringNote(this.type, this.mime); // here was !== undefined && utils.isStringNote(this.type, this.mime); I dont know why we need !=undefined. But it filters out canvas libary items } isContentAvailable() { diff --git a/src/public/app/components/root_command_executor.js b/src/public/app/components/root_command_executor.js index 6d65d5c80..a69d7c006 100644 --- a/src/public/app/components/root_command_executor.js +++ b/src/public/app/components/root_command_executor.js @@ -82,9 +82,10 @@ export default class RootCommandExecutor extends Component { async showBackendLogCommand() { await appContext.tabManager.openTabWithNoteWithHoisting('_backendLog', { activate: true }); } - + async showLaunchBarSubtreeCommand() { await this.showAndHoistSubtree('_lbRoot'); + this.showLeftPaneCommand(); } async showShareSubtreeCommand() { diff --git a/src/public/app/widgets/containers/ribbon_container.js b/src/public/app/widgets/containers/ribbon_container.js index 522a29e37..d6dcbe95c 100644 --- a/src/public/app/widgets/containers/ribbon_container.js +++ b/src/public/app/widgets/containers/ribbon_container.js @@ -227,7 +227,7 @@ export default class RibbonContainer extends NoteContextAwareWidget { .attr('data-ribbon-component-name', ribbonWidget.name) .append($('') .addClass(ret.icon) - .attr("data-title", ret.title) + .attr("title", ret.title) .attr('data-toggle-command', ribbonWidget.toggleCommand)) .append(" ") .append($('').text(ret.title)); diff --git a/src/public/app/widgets/dialogs/about.js b/src/public/app/widgets/dialogs/about.js index d58cb1091..f7ddea083 100644 --- a/src/public/app/widgets/dialogs/about.js +++ b/src/public/app/widgets/dialogs/about.js @@ -12,7 +12,7 @@ const TPL = `
${t("about.title")}
- +
diff --git a/src/public/app/widgets/dialogs/bulk_actions.js b/src/public/app/widgets/dialogs/bulk_actions.js index e1c3bcb1b..f21286500 100644 --- a/src/public/app/widgets/dialogs/bulk_actions.js +++ b/src/public/app/widgets/dialogs/bulk_actions.js @@ -45,8 +45,8 @@ const TPL = `

${t('bulk_actions.affected_notes')}: 0

- - + +

${t('bulk_actions.available_actions')}

diff --git a/src/public/app/widgets/dialogs/clone_to.js b/src/public/app/widgets/dialogs/clone_to.js index 5dfa8f05e..702063538 100644 --- a/src/public/app/widgets/dialogs/clone_to.js +++ b/src/public/app/widgets/dialogs/clone_to.js @@ -15,7 +15,7 @@ const TPL = `
${t('clone_to.clone_notes_to')}
- +
diff --git a/src/public/app/widgets/dialogs/confirm.js b/src/public/app/widgets/dialogs/confirm.js index 8a12a0755..041342c51 100644 --- a/src/public/app/widgets/dialogs/confirm.js +++ b/src/public/app/widgets/dialogs/confirm.js @@ -9,7 +9,7 @@ const TPL = `
${t('confirm.confirmation')}
- +
diff --git a/src/public/app/widgets/dialogs/delete_notes.js b/src/public/app/widgets/dialogs/delete_notes.js index d4b3454ac..acfab51c4 100644 --- a/src/public/app/widgets/dialogs/delete_notes.js +++ b/src/public/app/widgets/dialogs/delete_notes.js @@ -11,17 +11,17 @@ const TPL = `

${t('delete_notes.delete_notes_preview')}

- +
- - + +
- - + +
diff --git a/src/public/app/widgets/dialogs/include_note.js b/src/public/app/widgets/dialogs/include_note.js index e5fcad8a4..ad26a60fb 100644 --- a/src/public/app/widgets/dialogs/include_note.js +++ b/src/public/app/widgets/dialogs/include_note.js @@ -11,7 +11,7 @@ const TPL = `
${t('include_note.dialog_title')}
- +
diff --git a/src/public/app/widgets/dialogs/jump_to_note.js b/src/public/app/widgets/dialogs/jump_to_note.js index 75cd6b94a..919541bea 100644 --- a/src/public/app/widgets/dialogs/jump_to_note.js +++ b/src/public/app/widgets/dialogs/jump_to_note.js @@ -12,7 +12,7 @@ const TPL = `
- +
diff --git a/src/public/app/widgets/dialogs/markdown_import.js b/src/public/app/widgets/dialogs/markdown_import.js index 5fbb76118..720155b26 100644 --- a/src/public/app/widgets/dialogs/markdown_import.js +++ b/src/public/app/widgets/dialogs/markdown_import.js @@ -12,7 +12,7 @@ const TPL = `
${t("markdown_import.dialog_title")}
- +

${t("markdown_import.modal_body_text")}

diff --git a/src/public/app/widgets/dialogs/move_to.js b/src/public/app/widgets/dialogs/move_to.js index 4e596715e..4d28b99fb 100644 --- a/src/public/app/widgets/dialogs/move_to.js +++ b/src/public/app/widgets/dialogs/move_to.js @@ -13,7 +13,7 @@ const TPL = `
${t("move_to.dialog_title")}
- +
diff --git a/src/public/app/widgets/dialogs/note_type_chooser.js b/src/public/app/widgets/dialogs/note_type_chooser.js index 3a2e192a2..93fe69222 100644 --- a/src/public/app/widgets/dialogs/note_type_chooser.js +++ b/src/public/app/widgets/dialogs/note_type_chooser.js @@ -24,7 +24,7 @@ const TPL = `
${t("note_type_chooser.modal_title")}
- +
${t("note_type_chooser.modal_body")} diff --git a/src/public/app/widgets/dialogs/password_not_set.js b/src/public/app/widgets/dialogs/password_not_set.js index adaf0acaf..0d00dba18 100644 --- a/src/public/app/widgets/dialogs/password_not_set.js +++ b/src/public/app/widgets/dialogs/password_not_set.js @@ -8,7 +8,7 @@ const TPL = `
${t("password_not_set.title")}
- +
${t("password_not_set.body1")} diff --git a/src/public/app/widgets/dialogs/prompt.js b/src/public/app/widgets/dialogs/prompt.js index 0916ba2cd..c8a1fa016 100644 --- a/src/public/app/widgets/dialogs/prompt.js +++ b/src/public/app/widgets/dialogs/prompt.js @@ -9,7 +9,7 @@ const TPL = `
${t("prompt.title")}
- +
diff --git a/src/public/app/widgets/dialogs/protected_session_password.js b/src/public/app/widgets/dialogs/protected_session_password.js index 766cb5df9..e4437cfe5 100644 --- a/src/public/app/widgets/dialogs/protected_session_password.js +++ b/src/public/app/widgets/dialogs/protected_session_password.js @@ -14,8 +14,8 @@ const TPL = `
- - + +
diff --git a/src/public/app/widgets/dialogs/recent_changes.js b/src/public/app/widgets/dialogs/recent_changes.js index 17a512fad..4198b5786 100644 --- a/src/public/app/widgets/dialogs/recent_changes.js +++ b/src/public/app/widgets/dialogs/recent_changes.js @@ -18,7 +18,7 @@ const TPL = `
${t('recent_changes.title')}
- +
diff --git a/src/public/app/widgets/dialogs/revisions.js b/src/public/app/widgets/dialogs/revisions.js index 97c3e0315..077af547a 100644 --- a/src/public/app/widgets/dialogs/revisions.js +++ b/src/public/app/widgets/dialogs/revisions.js @@ -46,7 +46,7 @@ const TPL = ` title="${t("revisions.delete_all_revisions")}" style="padding: 0 10px 0 10px;" type="button">${t("revisions.delete_all_button")} - +
diff --git a/src/public/app/widgets/dialogs/sort_child_notes.js b/src/public/app/widgets/dialogs/sort_child_notes.js index 3c891a222..9dadb26e3 100644 --- a/src/public/app/widgets/dialogs/sort_child_notes.js +++ b/src/public/app/widgets/dialogs/sort_child_notes.js @@ -8,44 +8,44 @@ const TPL = `
${t("sort_child_notes.sort_children_by")}
- +
${t("sort_child_notes.sorting_criteria")}
- - + +
- - + +
- - + +

${t("sort_child_notes.sorting_direction")}
- - + +
- - + +

${t("sort_child_notes.folders")}
- - + +

${t("sort_child_notes.natural_sort")}
- - + +

diff --git a/src/public/app/widgets/dialogs/upload_attachments.js b/src/public/app/widgets/dialogs/upload_attachments.js index 9227df54a..92040a63c 100644 --- a/src/public/app/widgets/dialogs/upload_attachments.js +++ b/src/public/app/widgets/dialogs/upload_attachments.js @@ -11,7 +11,7 @@ const TPL = `
${t("upload_attachments.upload_attachments_to_note")}
- +
diff --git a/src/public/app/widgets/quick_search.js b/src/public/app/widgets/quick_search.js index d8bf09c88..17eeece6b 100644 --- a/src/public/app/widgets/quick_search.js +++ b/src/public/app/widgets/quick_search.js @@ -76,7 +76,7 @@ export default class QuickSearchWidget extends BasicWidget { }); shortcutService.bindElShortcut(this.$searchString, 'down', () => { - this.$dropdownMenu.find('.dropdown-item:first').focus(); + this.$dropdownMenu.find('.dropdown-item:not(.disabled):first').focus(); }); shortcutService.bindElShortcut(this.$searchString, 'esc', () => { diff --git a/src/public/app/widgets/sync_status.js b/src/public/app/widgets/sync_status.js index 68ede96c9..8fea1f111 100644 --- a/src/public/app/widgets/sync_status.js +++ b/src/public/app/widgets/sync_status.js @@ -96,7 +96,6 @@ export default class SyncStatusWidget extends BasicWidget { return; } - console.log("Align ", this.settings.titlePlacement); bootstrap.Tooltip.getOrCreateInstance(this.$widget.find(`.sync-status-${className}`), { html: true, placement: this.settings.titlePlacement, diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js index 0d00010e7..d280f4bc1 100644 --- a/src/public/app/widgets/tab_row.js +++ b/src/public/app/widgets/tab_row.js @@ -116,7 +116,6 @@ const TAB_ROW_TPL = ` .tab-row-widget .note-tab, .tab-row-widget .note-tab * { - user-select: none; cursor: default; } @@ -140,7 +139,7 @@ const TAB_ROW_TPL = ` pointer-events: all; color: var(--inactive-tab-text-color); --tab-background-color: var(--workspace-tab-background-color); - background-color: var(--tab-background-color, var(--inactive-tab-background-color)); + background-color: var(--tab-background-color, var(--inactive-tab-background-color)); } .tab-row-widget .note-tab[active] .note-tab-wrapper { @@ -177,6 +176,7 @@ const TAB_ROW_TPL = ` bottom: 0; right: 0; left: 0; + z-index: 1000; } .tab-row-widget .note-tab .note-tab-close { diff --git a/src/public/app/widgets/template_switch.js b/src/public/app/widgets/template_switch.js index 0c2c064ca..16609f620 100644 --- a/src/public/app/widgets/template_switch.js +++ b/src/public/app/widgets/template_switch.js @@ -22,7 +22,6 @@ export default class TemplateSwitchWidget extends SwitchWidget { this.$switchOffButton.attr("title", t("template_switch.toggle-off-hint")); this.$helpButton.attr("data-help-page", "template.html").show(); - this.$helpButton.on('click', e => utils.openHelp($(e.target))); } async switchOn() { diff --git a/src/public/app/widgets/type_widgets/canvas.js b/src/public/app/widgets/type_widgets/canvas.js index 08f7128e3..0c3d2ffd6 100644 --- a/src/public/app/widgets/type_widgets/canvas.js +++ b/src/public/app/widgets/type_widgets/canvas.js @@ -2,7 +2,7 @@ import libraryLoader from '../../services/library_loader.js'; import TypeWidget from './type_widget.js'; import utils from '../../services/utils.js'; import linkService from '../../services/link.js'; - +import server from '../../services/server.js'; const TPL = `