Skip to content

Commit b67ffa2

Browse files
committed
Set erase_chip as default option when not set before
1 parent 6577697 commit b67ffa2

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

src/js/ConfigStorage.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @param {string | string[]} key string or array of strings
44
* @returns {object}
55
*/
6-
export function get(key) {
6+
export function get(key, defaultValue = null) {
77
let result = {};
88
if (Array.isArray(key)) {
99
key.forEach(function (element) {
@@ -24,6 +24,11 @@ export function get(key) {
2424
}
2525
}
2626

27+
// if default value is set and key is not found in localStorage, set default value
28+
if (!result[key] && defaultValue !== null) {
29+
result[key] = defaultValue;
30+
}
31+
2732
return result;
2833
}
2934

src/js/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ function cleanupLocalStorage() {
7171
'selected_board',
7272
'unifiedConfigLast',
7373
'unifiedSourceCache',
74+
'erase_chip',
7475
];
7576

7677
for (const key in localStorage) {

src/js/tabs/firmware_flasher.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -574,12 +574,8 @@ firmware_flasher.initialize = function (callback) {
574574
self.isFlashing = false;
575575
}
576576

577-
let result = getConfig('erase_chip');
578-
if (result.erase_chip) {
579-
$('input.erase_chip').prop('checked', true);
580-
} else {
581-
$('input.erase_chip').prop('checked', false);
582-
}
577+
let result = getConfig('erase_chip', true);
578+
$('input.erase_chip').prop('checked', result.erase_chip);
583579

584580
$('input.erase_chip').change(function () {
585581
setConfig({'erase_chip': $(this).is(':checked')});

src/tabs/firmware_flasher.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<td>
100100
</td>
101101
</tr>
102-
<tr class="expertOptions option manual_baud_rate noboarder">
102+
<tr class="expertOptions option manual_baud_rate noborder">
103103
<td>
104104
<label>
105105
<input class="flash_manual_baud toggle" type="checkbox" />

src/tabs/setup.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<td i18n="initialSetupDrawing"></td>
176176
<td class="bat-mah-drawing">0.00 A</td>
177177
</tr>
178-
<tr class="noboarder">
178+
<tr class="noborder">
179179
<td i18n="initialSetupRSSI"></td>
180180
<td class="rssi">0 %</td>
181181
</tr>

0 commit comments

Comments
 (0)