Merge pull request #171 from bart-d/1.0.28-buildfixes

1.0.28 build fixes
blocktronics · Nov 10, 2020 · 395cdf9 · 395cdf9
2 parents 218f22b + 71e6ecd
commit 395cdf9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/app/html/controlcharacters.html b/app/html/controlcharacters.html
@@ -5,7 +5,6 @@
     <title>Control characters</title>
     <link rel="stylesheet" href="../css/global.css">
     <link rel="stylesheet" href="../css/controlcharacters.css">
-    <script src="../windows/controlcharacters.js"></script>
 </head>
 <body>
     <div id="content">
@@ -16,11 +15,12 @@
     unexpected broken or empty lines. If you care about compability and wish your creation to be perceived as created, it would be 
     best to avoid these characters.</p>
     </div>
-    <img src="../../build/png/controlcharacters.png" />
+    <img id="img_cc" src="" />
     <div id = "button_container">
         <button id = "cancel" type = "button">Cancel</button>
         <button id = "ok" class = "default" type = "button">OK</button>
     </div>
     <p>Press Cancel to return to the document, press OK to continue with saving.</p>
 </body>
+<script src="../windows/controlcharacters.js"></script>
 </html>
diff --git a/app/windows/controlcharacters.js b/app/windows/controlcharacters.js
@@ -31,6 +31,8 @@ document.addEventListener("DOMContentLoaded", (event) => {
     document.getElementById("cancel").addEventListener("click", event => cancel(), true);
 }, true);
 
+document.getElementById("img_cc").src=`${process.resourcesPath}/png/controlcharacters.png`;
+
 electron.ipcRenderer.on("ok", (event) => ok());
 electron.ipcRenderer.on("cancel", (event) => cancel());
 

diff --git a/electron-builder.yml b/electron-builder.yml
@@ -8,6 +8,9 @@ extraResources:
   - from: build/ans
     to: ans
     filter: "*.ans"
+  - from: build/png
+    to: png
+    filter: "*.png"
 fileAssociations:
   - ext: .ans
     name: ANSI Art
@@ -52,4 +55,4 @@ linux:
   target: deb
   description: Moebius is a new ANSI and ASCII Editor for Linux, MacOS, and Windows. The major feature that differentiates it from PabloDraw is the 'half-block' brush which allows editing in a style closer to Photoshop than a text editor, although you can still use the function and cursor keys to draw with, and you should find that most of the text editing features from PabloDraw are carried over to this editor.
   category: Graphics
-electronVersion: 8.3.0
+electronVersion: 8.5.2
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "browserify": "^16.5.1",
-    "electron": "^8.5.2",
+    "electron": "^8.5.3",
     "electron-builder": "^22.6.0",
     "express": "^4.17.1"
   },