Don't use process.resourcesPath.

Instead pass around __dirname from main.js as a common point of reference. Maybe fixes #19.
henrikingo · Jul 6, 2019 · 8616c0d · 8616c0d
1 parent cdf9e7d
commit 8616c0d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ have to edit raw CSS and HTML.
 
 ## HOWTO
 
-Pre-requisites: git, node 6.5+ and npm
+Pre-requisites: git, node 6.5+ and npm 5+
 
         git clone --recursive https://github.com/henrikingo/impressionist.git
         cd impressionist

diff --git a/js/impressionist.js b/js/impressionist.js
@@ -1056,7 +1056,7 @@
             // Aaannd then we reload impress and put the impressionist bits right back to where they were
             impress().init();
             var script = impressionist().util.loadJavaScript(
-                process.resourcesPath + "/../../../../js/impressionist.js", function(){
+                impressionist().rootDir + "/js/impressionist.js", function(){
                     impressionist().gc.pushElement(script); // The circle of life :-)
                     impressionist().util.triggerEvent(document, "impressionist:init", {}) 
                 });
@@ -1107,9 +1107,10 @@
  */
 (function ( document, window ) {
     'use strict';
-    // Just load it ASAP. No need to wait for impressionist:init
-    var link = impressionist().util.loadCss(process.resourcesPath + "/../../../../css/impressionist.css");
-    impressionist().gc.pushElement(link);
+    impressionist().gc.addEventListener(document, "impressionist:init", function (event) {
+        var link = impressionist().util.loadCss(impressionist().rootDir + "/css/impressionist.css");
+        impressionist().gc.pushElement(link);
+    });
 
 })(document, window);
 
@@ -1564,7 +1565,7 @@
         var html = '<div id="tinymce-toolbar"></div>';
         toolbar = impressionist().util.makeDomElement(html);
         gc.appendChild(document.body, toolbar);
-        script = impressionist().util.loadJavaScript(process.resourcesPath + "/../../../tinymce/tinymce.js", tinymceInit);
+        script = impressionist().util.loadJavaScript(impressionist().rootDir + "/node_modules/tinymce/tinymce.js", tinymceInit);
         impressionist().gc.pushElement(script);
     });
 

diff --git a/main.js b/main.js
@@ -15,7 +15,7 @@ function createWindow () {
     })
     mainWindow.maximize()
     // debug
-    //mainWindow.webContents.openDevTools()
+    mainWindow.webContents.openDevTools()
 
     // This triggers when user opens a presentation and it has loaded into the window
     mainWindow.webContents.on('dom-ready', function(event) {
@@ -50,13 +50,13 @@ function loadImpressionist () {
     // Windows support
     impressionistRoot = impressionistRoot.split("\\").join("/");
 
-    return `var impressionistRoot = '${impressionistRoot}';
-    var script = document.createElement("script");
+    return `var script = document.createElement("script");
     script.src = "${impressionistRoot}/js/impressionist.js";
     script.type = "text/javascript";
     script.onload = function(){
-        impressionist().gc.pushElement(script)
-        impressionist().util.triggerEvent(document, "impressionist:init", {})
+        impressionist().rootDir = '${impressionistRoot}';
+        impressionist().gc.pushElement(script);
+        impressionist().util.triggerEvent(document, "impressionist:init", {});
     };
     document.head.appendChild(script);
     `

diff --git a/src/plugins/electron/electron.js b/src/plugins/electron/electron.js
@@ -25,7 +25,7 @@
             // Aaannd then we reload impress and put the impressionist bits right back to where they were
             impress().init();
             var script = impressionist().util.loadJavaScript(
-                process.resourcesPath + "/../../../../js/impressionist.js", function(){
+                impressionist().rootDir + "/js/impressionist.js", function(){
                     impressionist().gc.pushElement(script); // The circle of life :-)
                     impressionist().util.triggerEvent(document, "impressionist:init", {}) 
                 });

diff --git a/src/plugins/loadcss/loadcss.js b/src/plugins/loadcss/loadcss.js
@@ -6,8 +6,9 @@
  */
 (function ( document, window ) {
     'use strict';
-    // Just load it ASAP. No need to wait for impressionist:init
-    var link = impressionist().util.loadCss(process.resourcesPath + "/../../../../css/impressionist.css");
-    impressionist().gc.pushElement(link);
+    impressionist().gc.addEventListener(document, "impressionist:init", function (event) {
+        var link = impressionist().util.loadCss(impressionist().rootDir + "/css/impressionist.css");
+        impressionist().gc.pushElement(link);
+    });
 
 })(document, window);
diff --git a/src/plugins/tinymce/tinymce.js b/src/plugins/tinymce/tinymce.js
@@ -75,7 +75,7 @@
         var html = '<div id="tinymce-toolbar"></div>';
         toolbar = impressionist().util.makeDomElement(html);
         gc.appendChild(document.body, toolbar);
-        script = impressionist().util.loadJavaScript(process.resourcesPath + "/../../../tinymce/tinymce.js", tinymceInit);
+        script = impressionist().util.loadJavaScript(impressionist().rootDir + "/node_modules/tinymce/tinymce.js", tinymceInit);
         impressionist().gc.pushElement(script);
     });