public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00
Code Issues Releases Wiki Activity

add targetDir parameter to outputFormatter

Browse Source
This commit is contained in:
Evan Miller
2019-02-11 11:10:10 -05:00
parent 4d727b0af7
commit bc24acd057
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
browser/components/MarkdownPreview.js
View File

@@ -295,7 +295,7 @@ export default class MarkdownPreview extends React.Component {
this.exportAsDocument('md') this.exportAsDocument('md')
} }
htmlContentFormatter (noteContent, exportTasks) { htmlContentFormatter (noteContent, exportTasks, targetDir) {
const { const {
fontFamily, fontFamily,
fontSize, fontSize,
@@ -339,6 +339,7 @@ export default class MarkdownPreview extends React.Component {
return `<html> return `<html>
<head> <head>
<base href="file://${targetDir}/">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name = "viewport" content = "width = device-width, initial-scale = 1, maximum-scale = 1"> <meta name = "viewport" content = "width = device-width, initial-scale = 1, maximum-scale = 1">
<style id="style">${inlineStyles}</style> <style id="style">${inlineStyles}</style>
@@ -349,13 +350,13 @@ export default class MarkdownPreview extends React.Component {
} }
handleSaveAsHtml () { 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 () { handleSaveAsPdf () {
this.exportAsDocument('pdf', (noteContent, exportTasks) => { this.exportAsDocument('pdf', (noteContent, exportTasks, targetDir) => {
const printout = new remote.BrowserWindow({show: false}) const printout = new remote.BrowserWindow({show: true})
printout.loadURL('data:text/html;charset=UTF-8,' + this.htmlContentFormatter(noteContent, exportTasks)) printout.loadURL('data:text/html;charset=UTF-8,' + this.htmlContentFormatter(noteContent, exportTasks, targetDir))
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
printout.webContents.on('did-finish-load', () => { printout.webContents.on('did-finish-load', () => {
printout.webContents.printToPDF({}, (err, data) => { printout.webContents.printToPDF({}, (err, data) => {

2
browser/main/lib/dataApi/exportNote.js
View File

@@ -43,7 +43,7 @@ function exportNote (nodeKey, storageKey, noteContent, targetPath, outputFormatt
) )
if (outputFormatter) { if (outputFormatter) {
exportedData = outputFormatter(exportedData, exportTasks) exportedData = outputFormatter(exportedData, exportTasks, path.dirname(targetPath))
} else { } else {
exportedData = Promise.resolve(exportedData) exportedData = Promise.resolve(exportedData)
} }