From 44018ee7e1525d9a3f013641516e8bd6356847fc Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Mon, 25 Sep 2017 15:43:02 +0200 Subject: [PATCH] Improve the LessLoader check to hopefully stop the message saying cookies were blocked. --- www/common/LessLoader.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/www/common/LessLoader.js b/www/common/LessLoader.js index f7e4f6985..3275c88b5 100644 --- a/www/common/LessLoader.js +++ b/www/common/LessLoader.js @@ -9,18 +9,20 @@ define([ var module = { exports: {} }; var key = Config.requireConf.urlArgs; var localStorage = {}; - try { - localStorage = window.localStorage || {}; - if (localStorage['LESS_CACHE'] !== key) { - Object.keys(localStorage).forEach(function (k) { - if (k.indexOf('LESS_CACHE|') !== 0) { return; } - delete localStorage[k]; - }); - localStorage['LESS_CACHE'] = key; + if (!window.cryptpadCache) { + try { + localStorage = window.localStorage || {}; + if (localStorage['LESS_CACHE'] !== key) { + Object.keys(localStorage).forEach(function (k) { + if (k.indexOf('LESS_CACHE|') !== 0) { return; } + delete localStorage[k]; + }); + localStorage['LESS_CACHE'] = key; + } + } catch (e) { + console.error(e); + localStorage = {}; } - } catch (e) { - console.error(e); - localStorage = {}; } var cacheGet = function (k, cb) {