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

fix CSS filter issue in firefox, closes #233

Browse Source
This commit is contained in:
azivner
2018-11-14 20:58:19 +01:00
parent 8a3f508825
commit fa264d1cbe
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,9 +3,9 @@ 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');
const $dialog = $('#markdown-import-dialog');
const $importTextarea = $('#markdown-import-textarea');
const $importButton = $('#markdown-import-button');
async function convertMarkdownToHtml(text) {
await libraryLoader.requireLibrary(libraryLoader.COMMONMARK);
@@ -35,25 +35,25 @@ async function importMarkdownInline() {
else {
$("input[name='search-text']").focus();
glob.activeDialog = $markdownImportDialog;
glob.activeDialog = $dialog;
$markdownImportDialog.modal();
$dialog.modal();
}
}
async function sendForm() {
const text = $markdownImportTextarea.val();
const text = $importTextarea.val();
$markdownImportDialog.modal('hide');
$dialog.modal('hide');
await convertMarkdownToHtml(text);
$markdownImportTextarea.val('');
$importTextarea.val('');
}
$markdownImportButton.click(sendForm);
$importButton.click(sendForm);
$markdownImportDialog.bind('keydown', 'ctrl+return', sendForm);
$dialog.bind('keydown', 'ctrl+return', sendForm);
// for CKEditor integration (button on block toolbar)
window.glob.importMarkdownInline = importMarkdownInline;