From 71e6ecdecb030dd00a14469425a9ec5e57af43bd Mon Sep 17 00:00:00 2001 From: Bart Dumon Date: Tue, 10 Nov 2020 22:44:42 +0100 Subject: [PATCH] 1.0.28 build fixes --- app/html/controlcharacters.html | 4 ++-- app/windows/controlcharacters.js | 2 ++ electron-builder.yml | 5 ++++- package-lock.json | 18 +++++++++--------- package.json | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/html/controlcharacters.html b/app/html/controlcharacters.html index 3fab3bd..ee011a7 100644 --- a/app/html/controlcharacters.html +++ b/app/html/controlcharacters.html @@ -5,7 +5,6 @@ Control characters -
@@ -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.

- +

Press Cancel to return to the document, press OK to continue with saving.

+ \ No newline at end of file diff --git a/app/windows/controlcharacters.js b/app/windows/controlcharacters.js index 4c6effa..c1f201f 100644 --- 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 index 94294dd..6121e58 100644 --- 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 index b712b11..829f77b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -419,9 +419,9 @@ } }, "boolean": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", - "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz", + "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==", "dev": true, "optional": true }, @@ -986,9 +986,9 @@ "dev": true }, "core-js": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", - "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz", + "integrity": "sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==", "dev": true, "optional": true }, @@ -1326,9 +1326,9 @@ } }, "electron": { - "version": "8.5.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-8.5.2.tgz", - "integrity": "sha512-VU+zZnmCzxoZ5UfBg2UGVm+nyxlNlQOQkotMLfk7FCtnkIOhX+sosl618OCxUWjOvPc+Mpg5MEkEmxPU5ziW4Q==", + "version": "8.5.3", + "resolved": "https://registry.npmjs.org/electron/-/electron-8.5.3.tgz", + "integrity": "sha512-cDozmnx6GUNpe9E/pkxeNZq78szgyM2LixlJ+Sov+SzYjXwzTdBfiWuELLkw047ucWvaDFCv5QuYGMmyjJPk7g==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index e78abfd..bf962e4 100644 --- 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" },