From 1abcc6935ae5213f9ae3e7c1fb97032134a5cd41 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 13 Jun 2020 12:15:10 -0400 Subject: [PATCH] remove hack and drop back to simple alert on storage block --- src/kiri/main.js | 6 +----- src/moto/kv.js | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/kiri/main.js b/src/kiri/main.js index b3d544a8..875eadcd 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -21,11 +21,7 @@ SECURE = isSecure(LOC.protocol), LOCAL = self.debug && !SETUP.remote, SDB = MOTO.KV, - PARA = SDB.getItem("__paranoid__"); - - if (PARA) alert(PARA); - - let ODB = KIRI.odb = new MOTO.Storage(SETUP.d ? SETUP.d[0] : 'kiri'), + ODB = KIRI.odb = new MOTO.Storage(SETUP.d ? SETUP.d[0] : 'kiri'), SPACE = KIRI.space = MOTO.Space, WIDGETS = KIRI.widgets = [], CATALOG = KIRI.catalog = KIRI.openCatalog(ODB,autoDecimate), diff --git a/src/moto/kv.js b/src/moto/kv.js index d3b32ab0..459bbd6f 100644 --- a/src/moto/kv.js +++ b/src/moto/kv.js @@ -7,16 +7,6 @@ if (!self.moto) self.moto = {}; if (self.moto.KV) return; - try { - self.moto.KV = self.localStorage; - self.moto.KV.setItem('__test', 1); - self.moto.KV.getItem('__test'); - } catch (e) { - let kv = self.moto.KV = new KV(); - kv.setItem("__paranoid__", "in private or restricted browsing mode. local storage blocked. application may not function."); - console.log(kv.getItem("__paranoid__")); - } - /** * @param {String} dbname * @param {number} [version] @@ -52,4 +42,15 @@ } }; + try { + self.moto.KV = self.localStorage; + self.moto.KV.setItem('__test', 1); + self.moto.KV.getItem('__test'); + } catch (e) { + self.moto.KV = new KV(); + let msg = "in private or restricted browsing mode. local storage blocked. application may not function."; + console.log(msg); + alert(msg); + } + })();