admin/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into boards

Browse Source
This commit is contained in:
王立帮
2024-09-20 01:05:24 +08:00
parent f009c027b0 6ca04ecf8c
commit fbbf82d4a4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/modules/mixly-modules/electron/file-tree.js
View File

@@ -21,7 +21,7 @@ const chokidar = Mixly.require('chokidar');
class FileTreeExt extends FileTree { class FileTreeExt extends FileTree {
static { static {
this.worker = new Worker('../common/modules/mixly-modules/workers/nodejs/node-file-watcher.js', { /*this.worker = new Worker('../common/modules/mixly-modules/workers/nodejs/node-file-watcher.js', {
name: 'nodeFileWatcher' name: 'nodeFileWatcher'
}); });
this.watcherEventsRegistry = new Registry(); this.watcherEventsRegistry = new Registry();
@@ -35,7 +35,7 @@ class FileTreeExt extends FileTree {
}); });
this.worker.addEventListener('error', (event) => { this.worker.addEventListener('error', (event) => {
Debug.error(event); Debug.error(event);
}); });*/
this.addEventListener = function(folderPath, func) { this.addEventListener = function(folderPath, func) {
FileTreeExt.watch(folderPath); FileTreeExt.watch(folderPath);

2
main.js
View File

@@ -81,7 +81,7 @@ function createWindow(filePath = null, indexUrl = null) {
allowRunningInsecureContent: true, allowRunningInsecureContent: true,
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
nodeIntegrationInWorker: true, nodeIntegrationInWorker: false,
allowRunningInsecureContent: true, allowRunningInsecureContent: true,
enableRemoteModule: true, enableRemoteModule: true,
contextIsolation: false, contextIsolation: false,