From 0d36f59036c7fdad735da2a8cde98b916a9a70d4 Mon Sep 17 00:00:00 2001 From: AWolf81 Date: Sun, 28 Jul 2019 15:02:17 +0200 Subject: [PATCH] Create turndown service & use gfm turndown plugin --- browser/components/CodeEditor.js | 4 ++-- browser/lib/turndown.js | 8 ++++++++ browser/main/lib/dataApi/createNoteFromUrl.js | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 browser/lib/turndown.js diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index 1abd15a9..7543e859 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -21,7 +21,7 @@ const { ipcRenderer, remote, clipboard } = require('electron') import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily' const spellcheck = require('browser/lib/spellcheck') const buildEditorContextMenu = require('browser/lib/contextMenuBuilder') -import TurndownService from 'turndown' +import { createTurndownService } from '../lib/turndown' import {languageMaps} from '../lib/CMLanguageList' import snippetManager from '../lib/SnippetManager' import {generateInEditor, tocExistsInEditor} from 'browser/lib/markdown-toc-generator' @@ -102,7 +102,7 @@ export default class CodeEditor extends React.Component { this.editorActivityHandler = () => this.handleEditorActivity() - this.turndownService = new TurndownService() + this.turndownService = createTurndownService() } handleSearch (msg) { diff --git a/browser/lib/turndown.js b/browser/lib/turndown.js new file mode 100644 index 00000000..085203a1 --- /dev/null +++ b/browser/lib/turndown.js @@ -0,0 +1,8 @@ +const TurndownService = require('turndown') +const { gfm } = require('turndown-plugin-gfm') + +export const createTurndownService = function () { + const turndown = new TurndownService() + turndown.use(gfm) + return turndown +} diff --git a/browser/main/lib/dataApi/createNoteFromUrl.js b/browser/main/lib/dataApi/createNoteFromUrl.js index 42e58d15..2897db0d 100644 --- a/browser/main/lib/dataApi/createNoteFromUrl.js +++ b/browser/main/lib/dataApi/createNoteFromUrl.js @@ -1,6 +1,6 @@ const http = require('http') const https = require('https') -const TurndownService = require('turndown') +const { createTurndownService } = require('../../../lib/turndown') const createNote = require('./createNote') import { push } from 'connected-react-router' @@ -16,7 +16,7 @@ function validateUrl (str) { function createNoteFromUrl (url, storage, folder, dispatch = null, location = null) { return new Promise((resolve, reject) => { - const td = new TurndownService() + const td = createTurndownService() if (!validateUrl(url)) { reject({result: false, error: 'Please check your URL is in correct format. (Example, https://www.google.com)'})