From 0244d07ea9afc0a7893c1ba448ec284e95a55073 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 10 Oct 2020 17:37:16 -0400 Subject: Storage controller refactor (#907) * Use array for use/quota nodes * Use classes instead of ids --- ext/bg/js/settings/storage-controller.js | 20 ++++++++++++-------- ext/bg/settings.html | 8 ++++---- 2 files changed, 16 insertions(+), 12 deletions(-) (limited to 'ext') diff --git a/ext/bg/js/settings/storage-controller.js b/ext/bg/js/settings/storage-controller.js index 72d5a606..bc57017f 100644 --- a/ext/bg/js/settings/storage-controller.js +++ b/ext/bg/js/settings/storage-controller.js @@ -31,12 +31,12 @@ class StorageController { prepare() { this._persistentStorageCheckbox = document.querySelector('#storage-persistent-checkbox'); - this._storageUsageNode = document.querySelector('#storage-usage'); - this._storageQuotaNode = document.querySelector('#storage-quota'); - this._storageUseFiniteNodes = document.querySelectorAll('#storage-use-finite'); - this._storageUseInfiniteNodes = document.querySelectorAll('#storage-use-infinite'); - this._storageUseValidNodes = document.querySelectorAll('#storage-use-valid'); - this._storageUseInvalidNodes = document.querySelectorAll('#storage-use-invalid'); + this._storageUsageNodes = document.querySelectorAll('.storage-usage'); + this._storageQuotaNodes = document.querySelectorAll('.storage-quota'); + this._storageUseFiniteNodes = document.querySelectorAll('.storage-use-finite'); + this._storageUseInfiniteNodes = document.querySelectorAll('.storage-use-infinite'); + this._storageUseValidNodes = document.querySelectorAll('.storage-use-valid'); + this._storageUseInvalidNodes = document.querySelectorAll('.storage-use-invalid'); this._preparePersistentStorage(); this.updateStats(); @@ -56,8 +56,12 @@ class StorageController { // Firefox reports usage as 0 when persistent storage is enabled. const finite = valid && (estimate.usage > 0 || !(await this._isStoragePeristent())); if (finite) { - this._storageUsageNode.textContent = this._bytesToLabeledString(estimate.usage); - this._storageQuotaNode.textContent = this._bytesToLabeledString(estimate.quota); + for (const node of this._storageUsageNodes) { + node.textContent = this._bytesToLabeledString(estimate.usage); + } + for (const node of this._storageQuotaNodes) { + node.textContent = this._bytesToLabeledString(estimate.quota); + } } this._setElementsVisible(this._storageUseFiniteNodes, valid && finite); diff --git a/ext/bg/settings.html b/ext/bg/settings.html index 19117937..c36bd8bf 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -805,13 +805,13 @@ -- cgit v1.2.3