summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-11-07 09:58:46 -0500
committertoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-11-25 10:34:23 -0500
commit614b428570a8bb5a964a92ae733e2b50e4d8bf51 (patch)
tree3665209149d0b1bc460d4d036ab6404d831c25d9
parent838175f06baca9503dca4180b01853a0a2afd734 (diff)
Fix byte count labels (#998)
* Add 'TB' label * Prevent overflow * Fix storage information on the old settings page
-rw-r--r--ext/bg/js/settings/storage-controller.js5
-rw-r--r--ext/bg/settings.html8
2 files changed, 7 insertions, 6 deletions
diff --git a/ext/bg/js/settings/storage-controller.js b/ext/bg/js/settings/storage-controller.js
index bc57017f..32b98304 100644
--- a/ext/bg/js/settings/storage-controller.js
+++ b/ext/bg/js/settings/storage-controller.js
@@ -148,9 +148,10 @@ class StorageController {
_bytesToLabeledString(size) {
const base = 1000;
- const labels = [' bytes', 'KB', 'MB', 'GB'];
+ const labels = [' bytes', 'KB', 'MB', 'GB', 'TB'];
+ const maxLabelIndex = labels.length - 1;
let labelIndex = 0;
- while (size >= base) {
+ while (size >= base && labelIndex < maxLabelIndex) {
size /= base;
++labelIndex;
}
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index fbd777d8..67a2d75c 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -818,14 +818,14 @@
</p>
</div>
- <div id="storage-use" hidden>
- <p class="help-block" class="storage-use-invalid">
+ <div id="storage-use">
+ <p class="help-block storage-use-invalid">
Yomichan is using an indeterminate amount of storage.
</p>
- <p class="help-block" class="storage-use-finite" hidden>
+ <p class="help-block storage-use-finite" hidden>
Yomichan is using approximately <strong class="storage-usage"></strong> of <strong class="storage-quota"></strong>.
</p>
- <p class="help-block" class="storage-use-infinite" hidden>
+ <p class="help-block storage-use-infinite" hidden>
Yomichan is permitted <strong>unlimited storage</strong>.
</p>
</div>