From 57f45f0c5f503c277ac4bfad08e51658ca87f5c9 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit@lex-persona.com>
Date: Sun, 25 Feb 2018 15:41:25 +0000
Subject: [PATCH] Added turndown settings

---
 src/components/menus/ImportMenu.vue |  8 ++------
 src/data/defaultSettings.yml        | 13 +++++++++++++
 src/services/cledit/cleditCore.js   | 11 ++++-------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/components/menus/ImportMenu.vue b/src/components/menus/ImportMenu.vue
index b780a0d5..c6d8f3c9 100644
--- a/src/components/menus/ImportMenu.vue
+++ b/src/components/menus/ImportMenu.vue
@@ -28,13 +28,9 @@ import TurndownService from 'turndown/lib/turndown.browser.umd';
 import htmlSanitizer from '../../libs/htmlSanitizer';
 import MenuEntry from './common/MenuEntry';
 import providerUtils from '../../services/providers/providerUtils';
+import store from '../../store';
 
-const turndownService = new TurndownService({
-  headingStyle: 'atx',
-  hr: '----------',
-  bulletListMarker: '-',
-  codeBlockStyle: 'fenced',
-});
+const turndownService = new TurndownService(store.getters['data/computedSettings'].turndown);
 
 const readFile = file => new Promise((resolve) => {
   if (file) {
diff --git a/src/data/defaultSettings.yml b/src/data/defaultSettings.yml
index 66493491..292f5d4e 100644
--- a/src/data/defaultSettings.yml
+++ b/src/data/defaultSettings.yml
@@ -59,6 +59,19 @@ pandoc:
   toc: true
   tocDepth: 3
 
+# HTML to Markdown converter options
+# See https://github.com/domchristie/turndown
+turndown:
+  headingStyle: atx
+  hr: ----------
+  bulletListMarker: '-'
+  codeBlockStyle: fenced
+  fence: '```'
+  emDelimiter: _
+  strongDelimiter: '**'
+  linkStyle: inlined
+  linkReferenceStyle: full
+
 # Default content for new files
 newFileContent: |
 
diff --git a/src/services/cledit/cleditCore.js b/src/services/cledit/cleditCore.js
index 00a04c33..7f724832 100644
--- a/src/services/cledit/cleditCore.js
+++ b/src/services/cledit/cleditCore.js
@@ -1,13 +1,7 @@
 import DiffMatchPatch from 'diff-match-patch';
 import TurndownService from 'turndown/lib/turndown.browser.umd';
 import htmlSanitizer from '../../libs/htmlSanitizer';
-
-const turndownService = new TurndownService({
-  headingStyle: 'atx',
-  hr: '----------',
-  bulletListMarker: '-',
-  codeBlockStyle: 'fenced',
-});
+import store from '../../store';
 
 function cledit(contentElt, scrollEltOpt) {
   const scrollElt = scrollEltOpt || contentElt;
@@ -114,6 +108,7 @@ function cledit(contentElt, scrollEltOpt) {
 
   function focus() {
     selectionMgr.restoreSelection();
+    contentElt.focus();
   }
 
   function addMarker(marker) {
@@ -337,6 +332,8 @@ function cledit(contentElt, scrollEltOpt) {
     adjustCursorPosition();
   });
 
+  const turndownService = new TurndownService(store.getters['data/computedSettings'].turndown);
+
   contentElt.addEventListener('paste', (evt) => {
     undoMgr.setCurrentMode('single');
     evt.preventDefault();