Fixed issue with electron and child windows open using window.open an…

…d invalid module paths again
icewolfz · Nov 24, 2021 · a971b5c · a971b5c
1 parent 40ee6f9
commit a971b5c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git a/build/characters.html b/build/characters.html
@@ -26,15 +26,8 @@
     <script type="text/javascript">
         if (window.module) module = window.module;
         //spell-checker:ignore yazl askonload keypress rgbcolor cmdfont selectpicker commandon prepend tablist tabpanel hellip emoteto  ABCDEFGHIJKLMNOPQRSTUVWXYZ
-        let Settings, library = './js/library';
-        try {
-            Settings = require('./js/settings').Settings;            
-        }
-        catch {
-            library = './build/js/library';
-            Settings = require('./build/js/settings').Settings;
-        }
-        const { parseTemplate, templatePath, isFileSync, isDirSync, decrypt, encrypt, clone, walkSync } = require(library);
+        const { parseTemplate, templatePath, isFileSync, isDirSync, decrypt, encrypt, clone, walkSync } = require('./js/library');
+        const Settings = require('./js/settings').Settings;
         const { shell, ipcRenderer } = require('electron');
         const path = require('path');
         const fs = require('fs');

diff --git a/build/code.editor.prefs.html b/build/code.editor.prefs.html
@@ -78,16 +78,10 @@
     <script src="../lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
     <script src="../lib/ace/ext-themelist.js" type="text/javascript"></script>
     <script type="text/javascript">
-        //spell-checker:ignore rgbcolor cmdfont selectpicker commandon prepend tablist tabpanel hellip emoteto  ABCDEFGHIJKLMNOPQRSTUVWXYZ
-        let EditorSettings, library = './js/library';
-        try {
-            EditorSettings = require('./js/editor/code.editor.settings').EditorSettings;
-        }
-        catch {
-            library = './build/js/library';
-            EditorSettings = require('./build/js/editor/code.editor.settings').EditorSettings;
-        }
-        const { parseTemplate, isDirSync } = require(library);
+        //spell-checker:ignore rgbcolor cmdfont selectpicker commandon prepend tablist tabpanel hellip emoteto  ABCDEFGHIJKLMNOPQRSTUVWXYZ       
+        const { parseTemplate, isDirSync } = require('./js/library.js');
+        const EditorSettings = require('./js/editor/code.editor.settings').EditorSettings;
+
         const { ipcRenderer, shell } = require('electron');
         const path = require('path');
         const fs = require('fs-extra');        

diff --git a/build/immortal.prefs.html b/build/immortal.prefs.html
@@ -77,15 +77,8 @@
     <script type="text/javascript">
         if (window.module) module = window.module;
         //spell-checker:ignore rgbcolor cmdfont selectpicker commandon prepend tablist tabpanel hellip emoteto  ABCDEFGHIJKLMNOPQRSTUVWXYZ
-        let Settings, TempType;
-        try {
-            Settings = require('./js/settings').Settings;            
-            TempType = require('./js/types').TempType;     
-        }
-        catch {
-            Settings = require('./build/js/settings').Settings;
-            TempType = require('./build/js/types').TempType;     
-        }
+        const { TempType } = require('./js/types');
+        const Settings = require('./js/settings').Settings;
 
         const { ipcRenderer } = require('electron');
         const path = require('path');

diff --git a/build/main.js b/build/main.js
@@ -1317,6 +1317,7 @@ function createWindow() {
             loadWindowScripts(w, frameName);
             addInputContext(w, set && set.spellchecking);
             w.show();
+            w.reload();
         });
         w.webContents.on('render-process-gone', (event, details) => {
             logError(`${url} render process gone, reason: ${details.reason}, exitCode ${details.exitCode}\n`, true);
@@ -3888,6 +3889,7 @@ function createNewWindow(name, options) {
             if (!options.noInput)
                 addInputContext(w, global.editorOnly ? (edSet && edSet.spellchecking) : (set && set.spellchecking));
             w.show();
+            w.reload();
         });
         w.webContents.on('render-process-gone', (event, details) => {
             logError(`${url} render process gone, reason: ${details.reason}, exitCode ${details.exitCode}\n`, true);
@@ -4335,6 +4337,7 @@ function createCodeEditor(show, loading, loaded) {
             loadWindowScripts(w, frameName);
             addInputContext(w, edSet && edSet.spellchecking);
             w.show();
+            w.reload();
         });
         w.webContents.on('render-process-gone', (event, details) => {
             logError(`${url} render process gone, reason: ${details.reason}, exitCode ${details.exitCode}\n`, true);