From dd0ad8dfa5a4cdab066602668ed182cb45098e10 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 8 Oct 2021 11:57:39 +0200 Subject: Fix local/session storage polyfill --- client/src/root-helpers/peertube-web-storage.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'client/src/root-helpers/peertube-web-storage.ts') diff --git a/client/src/root-helpers/peertube-web-storage.ts b/client/src/root-helpers/peertube-web-storage.ts index 68a2462de..0bbe2c9fc 100644 --- a/client/src/root-helpers/peertube-web-storage.ts +++ b/client/src/root-helpers/peertube-web-storage.ts @@ -6,19 +6,17 @@ function proxify (instance: MemoryStorage) { return new Proxy(instance, { set: function (obj, prop: string | symbol, value) { if (Object.prototype.hasOwnProperty.call(MemoryStorage, prop)) { - // FIXME: symbol typing issue https://github.com/microsoft/TypeScript/issues/1863 - instance[prop as any] = value + instance[prop] = value } else { instance.setItem(prop, value) } + return true }, get: function (target, name: string | symbol | number) { - if (Object.prototype.hasOwnProperty.call(MemoryStorage, name)) { - // FIXME: symbol typing issue https://github.com/microsoft/TypeScript/issues/1863 - return instance[name as any] - } - if (valuesMap.has(name)) { + if (typeof instance[name] === 'function') { + return instance[name] + } else if (valuesMap.has(name)) { return instance.getItem(name) } } @@ -26,7 +24,7 @@ function proxify (instance: MemoryStorage) { } class MemoryStorage implements Storage { - [key: string]: any + [key: string | symbol]: any getItem (key: any) { const stringKey = String(key) @@ -83,7 +81,7 @@ try { } // support Brave and other browsers using null rather than an exception -if (peertubeLocalStorage === null || peertubeSessionStorage === null) { +if (!peertubeLocalStorage || !peertubeSessionStorage) { reinitStorage() } -- cgit v1.2.3