Skip to content

Commit 4682312

Browse files
committed
Set erase_chip as default option when not set before
1 parent adf380c commit 4682312

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/js/ConfigStorage.js

Lines changed: 7 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,12 @@ 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 (!Object.keys(result).length && defaultValue !== null) {
29+
console.log('setting default value for', key, defaultValue);
30+
result[key] = defaultValue;
31+
}
32+
2733
return result;
2834
}
2935

src/js/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,15 @@ function readConfiguratorVersionMetadata() {
6666
}
6767

6868
function cleanupLocalStorage() {
69-
69+
// storage quota is 5MB, we need to clean up some stuff (more info see PR #2937)
7070
const cleanupLocalStorageList = [
7171
'cache',
7272
'firmware',
7373
'https',
7474
'selected_board',
7575
'unifiedConfigLast',
7676
'unifiedSourceCache',
77+
'erase_chip',
7778
];
7879

7980
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')});

0 commit comments

Comments
 (0)