Skip to content

Commit ae28c16

Browse files
tidy
1 parent 9e593ec commit ae28c16

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

js/storage.js

+11-4
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,13 @@ const get_storage_quota = (METRIC) => new Promise(resolve => {
161161

162162
const get_permissions = (item) => new Promise(resolve => {
163163
const METRIC = 'permission_'+ item
164+
const aGood = ['denied','granted','prompt']
164165
function exit(display, value) {
165166
if (value == undefined) {value = display}
166167
let notation = value == 'prompt' ? default_green : default_red
167168
addBoth(6, METRIC, display,'', notation, value)
168169

169-
if (item === 'persistent-storage' && value === 'granted') {
170+
if ('persistent-storage' == item && 'granted' == value) {
170171
// silent run manager to force granted quota when run
171172
Promise.all([get_storage_manager(0)]).then(function(){return resolve()})
172173
} else {
@@ -175,12 +176,18 @@ const get_permissions = (item) => new Promise(resolve => {
175176
}
176177
try {
177178
navigator.permissions.query({name:item}).then(function(r) {
178-
exit(r.state)
179+
let rstate = r.state
180+
if (runST) {rstate = undefined} else if (runSI) {rstate = 'allowed'}
181+
// checks
182+
let typeCheck = typeFn(rstate)
183+
if ('string' !== typeCheck) {throw zErrType + typeCheck}
184+
if (!aGood.includes(rstate)) {throw zErrInvalid +'expected '+ aGood.join(', ') +': got '+ rstate}
185+
exit(rstate)
179186
}).catch(e => {
180-
exit(log_error(6, METRIC, e), zErr)
187+
exit(e, zErrShort)
181188
})
182189
} catch(e) {
183-
exit(log_error(6, METRIC, e), zErr)
190+
exit(e, zErrShort)
184191
}
185192
})
186193

0 commit comments

Comments
 (0)