Skip to content

Commit 46fe57f

Browse files
committed
🩹 [2.1.82] Fix build broken by new jQuery.html()
1 parent 80e8d07 commit 46fe57f

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
The following enhancements and changes have been made to ***Auto Build Marlin***.
44

5+
## 2.1.82
6+
- ABM Panel: Fix `<env>` issue caused by changes in Chrome's `innerHTML`
7+
58
## 2.1.81
69
- ABM Panel: Highlight user's `MOTHERBOARD_ENV`
710
- ABM Panel / Edit View: Refactor CSS in sub-rules

abm/abm.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ <h1><a href="https://marlinfw.org">Marlin Firmware</a> <span>Auto Build <span id
8686
<tr>
8787
<td class="env-name"></td>
8888
<td>
89-
<button type="button" onclick="msg({ command:'pio', env:'<env>', cmd:'build' })" title="PIO Build"><img src="${ img_path('btn-build.svg') }" /> Build</button>
90-
<button class="upload" type="button" onclick="msg({ command:'pio', env:'<env>', cmd:'upload' })" title="PIO Upload"><img src="${ img_path('btn-upload.svg') }" /> Upload</button>
91-
<button class="debug" type="button" onclick="msg({ command:'pio', env:'<env>', cmd:'traceback' })" title="PIO Upload (Debug)"><img src="${ img_path('btn-debug.svg') }" /> Debug</button>
92-
<button class="clean" type="button" onclick="msg({ command:'pio', env:'<env>', cmd:'clean' })" title="PIO Clean"><img src="${ img_path('btn-clean.svg') }" /> Clean</button>
93-
<button class="clean purge" type="button" onclick="msg({ command:'pio', env:'<env>', cmd:'purge' })" title="Purge build folder"><img src="${ img_path('btn-clean.svg') }" /> Purge</button>
94-
<button class="run" type="button" onclick="msg({ command:'pio', env:'<env>', cmd:'run' })" title="Run">▷ Run</button>
89+
<button type="button" onclick="msg({ command:'pio', env:'#env#', cmd:'build' })" title="PIO Build"><img src="${ img_path('btn-build.svg') }" /> Build</button>
90+
<button class="upload" type="button" onclick="msg({ command:'pio', env:'#env#', cmd:'upload' })" title="PIO Upload"><img src="${ img_path('btn-upload.svg') }" /> Upload</button>
91+
<button class="debug" type="button" onclick="msg({ command:'pio', env:'#env#', cmd:'traceback' })" title="PIO Upload (Debug)"><img src="${ img_path('btn-debug.svg') }" /> Debug</button>
92+
<button class="clean" type="button" onclick="msg({ command:'pio', env:'#env#', cmd:'clean' })" title="PIO Clean"><img src="${ img_path('btn-clean.svg') }" /> Clean</button>
93+
<button class="clean purge" type="button" onclick="msg({ command:'pio', env:'#env#', cmd:'purge' })" title="Purge build folder"><img src="${ img_path('btn-clean.svg') }" /> Purge</button>
94+
<button class="run" type="button" onclick="msg({ command:'pio', env:'#env#', cmd:'run' })" title="Run">▷ Run</button>
9595
<span class="progress"></span>
9696
</td>
9797
</tr>

abm/js/abmview.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ var ABM = (() => {
148148
// .filename - The built binary Filename (if it exists)
149149
// .stamp - Timestamp Message
150150
const $env_td = $('#info-envs').html(''),
151-
$env_rows_src = $('#env-rows-src'),
151+
$env_rows_src = $('#env-rows-src').html(),
152152
$envs_table = $('<table>');
153153

154154
let has_progress = false, has_usb = false;
@@ -157,7 +157,7 @@ var ABM = (() => {
157157
if (v.name.match(/.+_USB.*/)) has_usb = true;
158158

159159
// Copy the template <table>, merging the env name. The <span> is allowed here!
160-
const $env_table_copy = $($env_rows_src.html().replace(/<env>/g, v.name));
160+
const $env_table_copy = $($env_rows_src.replace(/#env#/g, v.name));
161161
let $erows = $env_table_copy.find('tr').addClass(`env-${v.name}`);
162162

163163
// Set the env name in the new button row

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "auto-build",
33
"displayName": "Auto Build Marlin",
44
"description": "Provides an interface to configure, build, and upload Marlin Firmware.",
5-
"version": "2.1.81",
5+
"version": "2.1.82",
66
"preview": false,
77
"publisher": "marlinfirmware",
88
"icon": "icon.png",

0 commit comments

Comments
 (0)