Merge branch 'master' into export-yfm

browser/main/lib/dataApi/exportNoteAs.js

@@ -1,7 +1,6 @@
 import { findStorage } from 'browser/lib/findStorage'
 import exportNote from './exportNote'
-import formatMarkdown from './formatMarkdown'
-import formatHTML from './formatHTML'
+import getContentFormatter from './getContentFormatter'
 
 /**
  * @param {Object} note
@@ -10,34 +9,9 @@ import formatHTML from './formatHTML'
  * @param {Object} config
  */
 
-function exportNoteAs (note, filename, fileType, config) {
+function exportNoteAs(note, filename, fileType, config) {
   const storage = findStorage(note.storage)
-
-  let contentFormatter = null
-  if (fileType === 'md') {
-    contentFormatter = formatMarkdown({
-      storagePath: storage.path,
-      export: config.export
-    })
-  } else if (fileType === 'html') {
-    contentFormatter = formatHTML({
-      theme: config.ui.theme,
-      fontSize: config.preview.fontSize,
-      fontFamily: config.preview.fontFamily,
-      codeBlockTheme: config.preview.codeBlockTheme,
-      codeBlockFontFamily: config.editor.fontFamily,
-      lineNumber: config.preview.lineNumber,
-      indentSize: config.editor.indentSize,
-      scrollPastEnd: config.preview.scrollPastEnd,
-      smartQuotes: config.preview.smartQuotes,
-      breaks: config.preview.breaks,
-      sanitize: config.preview.sanitize,
-      customCSS: config.preview.customCSS,
-      allowCustomCSS: config.preview.allowCustomCSS,
-      storagePath: storage.path,
-      export: config.export
-    })
-  }
+  const contentFormatter = getContentFormatter(storage, fileType, config)
 
   return exportNote(storage.key, note, filename, contentFormatter)
 }