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

refactored import markdown dialog into separate file, fixes #206

Browse Source
This commit is contained in:
azivner
2018-11-08 19:42:57 +01:00
parent 273a9b14d9
commit 3ba761fe28
3 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/public/javascripts/dialogs/markdown_import.js Normal file
View File

@@ -0,0 +1,63 @@
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";
const $markdownImportDialog = $('#markdown-import-dialog');
const $markdownImportTextarea = $('#markdown-import-textarea');
const $markdownImportButton = $('#markdown-import-button');
async function convertMarkdownToHtml(text) {
await libraryLoader.requireLibrary(libraryLoader.COMMONMARK);
const reader = new commonmark.Parser();
const writer = new commonmark.HtmlRenderer();
const parsed = reader.parse(text);
const result = writer.render(parsed);
const textEditor = noteDetailTextService.getEditor();
const viewFragment = textEditor.data.processor.toView(result);
const modelFragment = textEditor.data.toModel(viewFragment);
textEditor.model.insertContent(modelFragment, textEditor.model.document.selection);
infoService.showMessage("Markdown content has been imported into the document.");
}
async function importMarkdownInline() {
if (utils.isElectron()) {
const {clipboard} = require('electron');
const text = clipboard.readText();
convertMarkdownToHtml(text);
}
else {
$("input[name='search-text']").focus();
glob.activeDialog = $markdownImportDialog;
$markdownImportDialog.modal();
}
}
async function sendForm() {
const text = $markdownImportTextarea.val();
$markdownImportDialog.modal('hide');
await convertMarkdownToHtml(text);
$markdownImportTextarea.val('');
}
$markdownImportButton.click(sendForm);
$markdownImportDialog.bind('keydown', 'ctrl+return', sendForm);
// for CKEditor integration (button on block toolbar)
window.glob.importMarkdownInline = importMarkdownInline;
export default {
importMarkdownInline
};

1
src/public/javascripts/services/bootstrap.js vendored
View File

@@ -6,6 +6,7 @@ import noteSourceDialog from '../dialogs/note_source.js';
import recentChangesDialog from '../dialogs/recent_changes.js'; import recentChangesDialog from '../dialogs/recent_changes.js';
import optionsDialog from '../dialogs/options.js'; import optionsDialog from '../dialogs/options.js';
import sqlConsoleDialog from '../dialogs/sql_console.js'; import sqlConsoleDialog from '../dialogs/sql_console.js';
import markdownImportDialog from '../dialogs/markdown_import.js';
import cloning from './cloning.js'; import cloning from './cloning.js';
import contextMenu from './tree_context_menu.js'; import contextMenu from './tree_context_menu.js';

55
src/public/javascripts/services/note_detail_text.js
View File

@@ -1,14 +1,8 @@
import libraryLoader from "./library_loader.js"; import libraryLoader from "./library_loader.js";
import noteDetailService from './note_detail.js'; import noteDetailService from './note_detail.js';
import utils from "./utils.js";
import infoService from "./info.js";
const $component = $('#note-detail-text'); const $component = $('#note-detail-text');
const $markdownImportDialog = $('#markdown-import-dialog');
const $markdownImportTextarea = $('#markdown-import-textarea');
const $markdownImportButton = $('#markdown-import-button');
let textEditor = null; let textEditor = null;
async function show() { async function show() {
@@ -49,59 +43,10 @@ function getEditor() {
return textEditor; return textEditor;
} }
async function convertMarkdownToHtml(text) {
await libraryLoader.requireLibrary(libraryLoader.COMMONMARK);
const reader = new commonmark.Parser();
const writer = new commonmark.HtmlRenderer();
const parsed = reader.parse(text);
const result = writer.render(parsed);
const viewFragment = textEditor.data.processor.toView(result);
const modelFragment = textEditor.data.toModel(viewFragment);
textEditor.model.insertContent(modelFragment, textEditor.model.document.selection);
infoService.showMessage("Markdown content has been imported into the document.");
}
async function importMarkdownInline() {
if (utils.isElectron()) {
const {clipboard} = require('electron');
const text = clipboard.readText();
convertMarkdownToHtml(text);
}
else {
$("input[name='search-text']").focus();
glob.activeDialog = $markdownImportDialog;
$markdownImportDialog.modal();
}
}
async function sendMarkdownDialog() {
const text = $markdownImportTextarea.val();
$markdownImportDialog.modal('hide');
await convertMarkdownToHtml(text);
$markdownImportTextarea.val('');
}
function onNoteChange(func) { function onNoteChange(func) {
textEditor.model.document.on('change:data', func); textEditor.model.document.on('change:data', func);
} }
$markdownImportButton.click(sendMarkdownDialog);
$markdownImportDialog.bind('keydown', 'ctrl+return', sendMarkdownDialog);
window.glob.importMarkdownInline = importMarkdownInline;
export default { export default {
show, show,
getEditor, getEditor,