diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 6307abf40..7a814202c 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -295,7 +295,7 @@ export default class MarkdownPreview extends React.Component {
this.exportAsDocument('md')
}
- htmlContentFormatter (noteContent, exportTasks) {
+ htmlContentFormatter (noteContent, exportTasks, targetDir) {
const {
fontFamily,
fontSize,
@@ -339,6 +339,7 @@ export default class MarkdownPreview extends React.Component {
return `
+
@@ -349,13 +350,13 @@ export default class MarkdownPreview extends React.Component {
}
handleSaveAsHtml () {
- this.exportAsDocument('html', (noteContent, exportTasks) => Promise.resolve(this.htmlContentFormatter(noteContent, exportTasks)))
+ this.exportAsDocument('html', (noteContent, exportTasks, targetDir) => Promise.resolve(this.htmlContentFormatter(noteContent, exportTasks, targetDir)))
}
handleSaveAsPdf () {
- this.exportAsDocument('pdf', (noteContent, exportTasks) => {
- const printout = new remote.BrowserWindow({show: false})
- printout.loadURL('data:text/html;charset=UTF-8,' + this.htmlContentFormatter(noteContent, exportTasks))
+ this.exportAsDocument('pdf', (noteContent, exportTasks, targetDir) => {
+ const printout = new remote.BrowserWindow({show: true})
+ printout.loadURL('data:text/html;charset=UTF-8,' + this.htmlContentFormatter(noteContent, exportTasks, targetDir))
return new Promise((resolve, reject) => {
printout.webContents.on('did-finish-load', () => {
printout.webContents.printToPDF({}, (err, data) => {
diff --git a/browser/main/lib/dataApi/exportNote.js b/browser/main/lib/dataApi/exportNote.js
index c65697308..75c451c13 100755
--- a/browser/main/lib/dataApi/exportNote.js
+++ b/browser/main/lib/dataApi/exportNote.js
@@ -43,7 +43,7 @@ function exportNote (nodeKey, storageKey, noteContent, targetPath, outputFormatt
)
if (outputFormatter) {
- exportedData = outputFormatter(exportedData, exportTasks)
+ exportedData = outputFormatter(exportedData, exportTasks, path.dirname(targetPath))
} else {
exportedData = Promise.resolve(exportedData)
}