github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-03 18:21:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: #338 error message on export cancel (#364)

Browse Source 
* bugfix: #338 error message on export cancel

* fixed the solution

* put package-lock.json back
This commit is contained in:
mklpiening 2018-06-19 04:26:27 +02:00 committed by 冉四夕
parent 1073e650cc
commit 1f0b65d95c
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/actions/file.js
View File

@ -20,24 +20,26 @@ const handleResponseForExport = (e, { type, content, pathname }) => {
defaultPath
})
// If export PDF, the content will be undefined.
if (!content && type === 'pdf') {
win.webContents.printToPDF({ printBackground: true }, (err, data) => {
if (err) log(err)
else {
writeFile(filePath, data, extension)
.then(() => {
win.webContents.send('AGANI::export-success', { type, filePath })
})
.catch(log)
}
})
} else {
writeFile(filePath, content, extension)
.then(() => {
win.webContents.send('AGANI::export-success', { type, filePath })
if (filePath) {
// If export PDF, the content will be undefined.
if (!content && type === 'pdf') {
win.webContents.printToPDF({ printBackground: true }, (err, data) => {
if (err) log(err)
else {
writeFile(filePath, data, extension)
.then(() => {
win.webContents.send('AGANI::export-success', { type, filePath })
})
.catch(log)
}
})
.catch(log)
} else {
writeFile(filePath, content, extension)
.then(() => {
win.webContents.send('AGANI::export-success', { type, filePath })
})
.catch(log)
}
}
}