Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-07 22:05:44 +01:00
Code Issues Packages Projects Releases Activity

fix access to editor instance if active note is not text

Browse Source
This commit is contained in:
zadam
2019-05-19 09:13:13 +02:00
parent 8c46e96397
commit 722380e7b8
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/javascripts/dialogs/add_link.js
View File

@@ -93,7 +93,7 @@ $form.submit(() => {
$dialog.modal('hide');
const linkHref = '#' + notePath;
const editor = noteDetailService.getActiveComponent().getEditor();
const editor = noteDetailService.getActiveEditor();
if (hasSelection()) {
editor.execute('link', linkHref);
@@ -128,7 +128,7 @@ $form.submit(() => {
// returns true if user selected some text, false if there's no selection
function hasSelection() {
const model = noteDetailService.getActiveComponent().getEditor().model;
const model = noteDetailService.getActiveEditor().model;
const selection = model.document.selection;
return !selection.isCollapsed;

4
src/public/javascripts/dialogs/markdown_import.js
View File

@@ -1,7 +1,7 @@
import libraryLoader from "../services/library_loader.js";
import infoService from "../services/info.js";
import utils from "../services/utils.js";
import noteDetailTextService from "../services/note_detail_text.js";
import noteDetailService from "../services/note_detail.js";
const $dialog = $('#markdown-import-dialog');
const $importTextarea = $('#markdown-import-textarea');
@@ -16,7 +16,7 @@ async function convertMarkdownToHtml(text) {
const result = writer.render(parsed);
const textEditor = noteDetailTextService.getEditor();
const textEditor = noteDetailService.getActiveEditor();
const viewFragment = textEditor.data.processor.toView(result);
const modelFragment = textEditor.data.toModel(viewFragment);