diff --git a/lib/client.js b/lib/client.js index 07ba5008..61483f22 100644 --- a/lib/client.js +++ b/lib/client.js @@ -325,7 +325,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCommander; CloudCmd._changeLinks(CloudFunc.RIGHTPANEL); /* устанавливаем переменную доступности кэша */ - DOM.Cache.isAllowed(); + DOM.Cache.setAllowed(true); /* Устанавливаем кэш корневого каталога */ var lDirPath = DOM.getCurrentDirPath(); if( !DOM.Cache.get(lDirPath) ) diff --git a/lib/client/dom.js b/lib/client/dom.js index 8b756ff7..c13386f0 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -326,29 +326,17 @@ var CloudCommander, Util, DOM = {}, CloudFunc; /* функция проверяет возможно ли работать с кэшем каким-либо образом */ this.isAllowed = function(){ - CacheAllowed = Util.isObject( window.localStorage ); - return CacheAllowed; + var lRet = CacheAllowed && window.localStorage; + return lRet; }; - /** * allow cache usage */ - this.setAllowed = function(){ - var lRet = this; - CacheAllowed = true; + this.setAllowed = function(pAllowd){ + CacheAllowed = pAllowd; - return lRet; - }; - - /** - * dissalow cache usage - */ - this.UnSetAllowed = function(){ - var lRet = this; - CacheAllowed = false; - - return lRet; + return pAllowd; }; /** remove element */ @@ -376,7 +364,7 @@ var CloudCommander, Util, DOM = {}, CloudFunc; /** Если доступен Cache принимаем из него данные*/ this.get = function(pName){ - var lRet = this; + var lRet; if(CacheAllowed) lRet = localStorage.getItem(pName); diff --git a/lib/client/ie.js b/lib/client/ie.js index dacb2142..974ae5e7 100644 --- a/lib/client/ie.js +++ b/lib/client/ie.js @@ -215,12 +215,9 @@ var Util, DOM, jQuery; return CacheAllowed; }; - this.setAllowed = function(){ - CacheAllowed = true; - }; - - this.UnSetAllowed = function(){ - CacheAllowed = false; + this.setAllowed = function(pAllowed){ + CacheAllowed = pAllowed; + return pAllowed; }; /** remove element */ @@ -255,6 +252,16 @@ var Util, DOM, jQuery; return lRet; }, + /* get all cache from local storage */ + this.getAll = function(){ + var lRet = null; + + if(CacheAllowed) + lRet = Data; + + return lRet; + }; + /** функция чистит весь кэш для всех каталогов*/ this.clear = function(){ var lRet = this;