fix not working export as pdf on linux, upgrade electron-packager to …

…version 7.4.0
dbackowski · Aug 4, 2016 · 3ed6db9 · 3ed6db9
1 parent 84fc5aa
commit 3ed6db9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/app/pdf.html b/app/pdf.html
@@ -0,0 +1,12 @@
+<html>
+  <head>
+    <style>
+    </style>
+  </head>
+  <body>
+    <script>
+      document.getElementsByTagName('style')[0].innerHTML = require('electron').remote.getGlobal('sharedObject').style;
+      document.getElementsByTagName('body')[0].innerHTML = require('electron').remote.getGlobal('sharedObject').body;
+    </script>
+  </body>
+</html>
diff --git a/main.js b/main.js
@@ -7,7 +7,6 @@ const Menu = electron.Menu;
 const dialog = electron.dialog;
 const fs = require('fs');
 const ipcMain = electron.ipcMain;
-const convertFactory = require('electron-html-to');
 
 let mainWindow;
 let aboutWindow;
@@ -235,28 +234,25 @@ function exportAsPdfHandler() {
     let pdfFileName = dialog.showSaveDialog({ filters: [{ name: 'pdf', extensions: ['pdf'] }]});
 
     if (pdfFileName !== undefined) {
-      let conversion = convertFactory({
-        converterPath: convertFactory.converters.PDF
-      });
+      let pdfWindow = new BrowserWindow({ show: false });
 
-      let html_body = `<html>
-                        <head>
-                          <style>
-                            ${fs.readFileSync(__dirname + '/app/css/style.css').toString()}
-                          </style>
-                        </head>
-                        <body>
-                          ${arg}
-                        </body>
-                      </html>`;
+      global.sharedObject = {
+        style: fs.readFileSync(__dirname + '/app/css/style.css').toString(),
+        body: arg
+      };
 
-      conversion({ html: html_body }, function(err, result) {
-        if (err) {
-          return dialog.showErrorBox('Unable to export as PDF', err.message);
-        }
+      pdfWindow.loadURL('file://' + __dirname + '/app/pdf.html');
+
+      pdfWindow.webContents.on("did-finish-load", function() {
+        pdfWindow.webContents.printToPDF({ printBackground: true }, function(error, data) {
+          if (error) throw error;
 
-        result.stream.pipe(fs.createWriteStream(pdfFileName));
-        conversion.kill();
+          fs.writeFile(pdfFileName, data, function(err) {
+            if (err) {
+              return dialog.showErrorBox('Unable to export as PDF', err.message);
+            }
+          })
+        })
       });
     }
   });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MdEditor",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Simple markdown editor",
   "main": "main.js",
   "scripts": {
@@ -18,8 +18,7 @@
   "devDependencies": {
     "codemirror": "^5.14.2",
     "css-loader": "^0.23.1",
-    "electron-html-to": "^2.0.2",
-    "electron-packager": "7.3.0",
+    "electron-packager": "7.4.0",
     "electron-prebuilt": "1.3.1",
     "extract-text-webpack-plugin": "^1.0.1",
     "highlight.js": "^9.3.0",