From 5cd04d01916119e6b78ba17255a20997f601ad1e Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 16 Jul 2014 02:54:17 -0400 Subject: [PATCH] fix(client) disable localStorage --- lib/client.js | 36 +++++++++++++++--------------------- lib/client/files.js | 14 +++++++++++++- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/lib/client.js b/lib/client.js index 4a638d1f..107bdff8 100644 --- a/lib/client.js +++ b/lib/client.js @@ -236,15 +236,17 @@ var Util, DOM, CloudFunc; } function baseInit(callback) { - var files = DOM.getFiles(), - LEFT = CloudFunc.PANEL_LEFT, - RIGHT = CloudFunc.PANEL_RIGHT; + var dirPath = '', + files = DOM.getFiles(), + LEFT = CloudFunc.PANEL_LEFT, + RIGHT = CloudFunc.PANEL_RIGHT; /* выделяем строку с первым файлом */ if (files) DOM.setCurrentFile(files[0]); - - Listeners = CloudCmd.Listeners; + + dirPath = DOM.getCurrentDirPath(), + Listeners = CloudCmd.Listeners; Listeners.init(); /* загружаем Google Analytics */ Listeners.analytics(); @@ -254,22 +256,14 @@ var Util, DOM, CloudFunc; Listeners.initKeysPanel(); - Files.get('config', function(error, config) { - var localStorage = config.localStorage, - dirPath = DOM.getCurrentDirPath(); - - /* устанавливаем переменную доступности кэша */ - Storage.setAllowed(localStorage); - /* Устанавливаем кэш корневого каталога */ - - dirPath = CloudFunc.rmLastSlash(dirPath) || '/'; - - Storage.get(dirPath, function(error, data) { - if (!data) { - data = getJSONfromFileTable(); - Storage.set(dirPath, data); - } - }); + /* Устанавливаем кэш корневого каталога */ + dirPath = CloudFunc.rmLastSlash(dirPath) || '/'; + + Storage.get(dirPath, function(error, data) { + if (!data) { + data = getJSONfromFileTable(); + Storage.set(dirPath, data); + } }); callback(); diff --git a/lib/client/files.js b/lib/client/files.js index 8b175d51..d0fa34b6 100644 --- a/lib/client/files.js +++ b/lib/client/files.js @@ -11,6 +11,7 @@ var Util, DOM, Promise; function FilesProto(Util, DOM) { var Promises = {}, + Storage = DOM.Storage, Files = this, FILES_JSON = 'config|modules|ext', FILES_HTML = 'file|path|link|pathLink|media', @@ -59,6 +60,9 @@ var Util, DOM, Promise; callback(null); } + if (name === 'config') + setConfig(data); + return Files; }; @@ -138,11 +142,19 @@ var Util, DOM, Promise; }); Promises.config.then(function(data) { - if (!Data.config) + if (!Data.config) { Data.config = data; + Storage.setAllowed(data.localStorage); + } callback(null, data); }); } + + function setConfig(config) { + var isStorage = config.localStorage; + + Storage.setAllowed(isStorage); + } } })(Util, DOM);