diff --git a/common/modules/mixly-modules/common/arduino-cli.js b/common/modules/mixly-modules/common/arduino-cli.js index daf43209..4a105ad1 100644 --- a/common/modules/mixly-modules/common/arduino-cli.js +++ b/common/modules/mixly-modules/common/arduino-cli.js @@ -61,9 +61,7 @@ class ArduinoCLI { return true; } - async exec(name, config) { - - } + async exec(name, config) {} } }); \ No newline at end of file diff --git a/common/modules/mixly-modules/common/component.js b/common/modules/mixly-modules/common/component.js index 9da86261..12b57cbd 100644 --- a/common/modules/mixly-modules/common/component.js +++ b/common/modules/mixly-modules/common/component.js @@ -14,7 +14,7 @@ class Component { #$content_ = null; #mounted_ = false; #disposed_ = false; - #events_ = new Events(['destroyed', 'created']); + #events_ = new Events(['destroyed']); #id_ = IdGenerator.generate(); constructor() {} @@ -63,10 +63,10 @@ class Component { } dispose() { - this.runEvent('destroyed'); this.#$content_.remove(); this.resetEvent(); this.#disposed_ = true; + this.runEvent('destroyed'); } bind(type, func) { diff --git a/common/modules/mixly-modules/common/editor-base.js b/common/modules/mixly-modules/common/editor-base.js index 6776f204..1bbadaea 100644 --- a/common/modules/mixly-modules/common/editor-base.js +++ b/common/modules/mixly-modules/common/editor-base.js @@ -41,6 +41,8 @@ class EditorBase extends PageBase { undo() {} redo() {} + + empty() {} } Mixly.EditorBase = EditorBase; diff --git a/common/modules/mixly-modules/common/fs-board.js b/common/modules/mixly-modules/common/fs-board.js index abfcb6b4..bb195778 100644 --- a/common/modules/mixly-modules/common/fs-board.js +++ b/common/modules/mixly-modules/common/fs-board.js @@ -16,7 +16,7 @@ class FSBoard { constructor() {} - #addParms_(usrFolder, fsType) { + #addParams_(usrFolder, fsType) { this.#handler_.updateConfig({ port: Serial.getSelectedPortName() }); @@ -25,12 +25,12 @@ class FSBoard { } async download(usrFolder, fsType) { - this.#addParms_(usrFolder, fsType); + this.#addParams_(usrFolder, fsType); this.#handler_.onBeforeDownload(); } async upload(usrFolder, fsType) { - this.#addParms_(usrFolder, fsType); + this.#addParams_(usrFolder, fsType); this.#handler_.onBeforeUpload(); } diff --git a/common/modules/mixly-modules/common/page-base.js b/common/modules/mixly-modules/common/page-base.js index 26ebed26..b3ae2a21 100644 --- a/common/modules/mixly-modules/common/page-base.js +++ b/common/modules/mixly-modules/common/page-base.js @@ -22,7 +22,7 @@ class PageBase extends Component { constructor() { super(); - this.addEventsType(['addDirty', 'removeDirty', 'active']); + this.addEventsType(['created', 'addDirty', 'removeDirty', 'active']); } init() { diff --git a/common/modules/mixly-modules/electron/fs-board.js b/common/modules/mixly-modules/electron/fs-board.js index d3ac16cd..220091ae 100644 --- a/common/modules/mixly-modules/electron/fs-board.js +++ b/common/modules/mixly-modules/electron/fs-board.js @@ -139,7 +139,7 @@ class FSBoardExt extends FSBoard { return Mustache.render(template, { ...config, python3: `"${Env.python3Path}"`, - esptool: `"${Env.python3Path}" "${path.join(Env.srcDirPath, 'tools/python/esptool/__init__.py')}"` + esptool: `"${Env.python3Path}" "${path.join(Env.srcDirPath, 'tools/python/esptool_main.py')}"` }); } diff --git a/common/templates/html/file-tree.html b/common/templates/html/file-tree.html index 51a7a24d..4baf7b4d 100644 --- a/common/templates/html/file-tree.html +++ b/common/templates/html/file-tree.html @@ -53,6 +53,7 @@ text-align: left; border: 1px solid; border-color: transparent; + border-radius: 0px; padding: 0 1px; } diff --git a/common/templates/html/search-div.html b/common/templates/html/search-div.html index 046217c5..e3b8b803 100644 --- a/common/templates/html/search-div.html +++ b/common/templates/html/search-div.html @@ -13,6 +13,7 @@ right: 2px; height: 30px; width: auto; + border-radius: 0px; } html[data-bs-theme=light] div[m-id="{{d.mId}}"] > input {