diff --git a/lib/client.js b/lib/client.js index c74a3917..28637dac 100644 --- a/lib/client.js +++ b/lib/client.js @@ -603,7 +603,7 @@ CloudCmd._ajaxLoad = function(pFullPath, pOptions){ if (lJSON){ /* переводим из текста в JSON */ - lJSON = DOM.parseJSON(lJSON); + lJSON = Util.parseJSON(lJSON); CloudCmd._createFileTable(lPanel, lJSON); CloudCmd._changeLinks(lPanel); @@ -631,7 +631,7 @@ CloudCmd._ajaxLoad = function(pFullPath, pOptions){ /* переводим таблицу файлов в строку, для * сохранения в localStorage */ - var lJSON_s = JSON.stringify(data); + var lJSON_s = Util.stringifyJSON(data); Util.log(lJSON_s.length); /* если размер данных не очень бошьой @@ -749,7 +749,7 @@ CloudCmd._getJSONfromFileTable = function(){ mode: lMode }; } - return JSON.stringify(lFileTable); + return Util.stringifyJSON(lFileTable); }; return CloudCmd; diff --git a/lib/client/dom.js b/lib/client/dom.js index 9f62f561..2518832f 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -141,7 +141,7 @@ var CloudCommander, Util, /* If it's json - parse it as json */ if(lType && Util.isContainStr(lType, 'application/json') ){ var lResult = Util.tryCatch(function(){ - lData = DOM.parseJSON(lJqXHR.response); + lData = Util.parseJSON(lJqXHR.response); }); if( Util.log(lResult) ) @@ -804,7 +804,7 @@ var CloudCommander, Util, lFunc = function(pData){ var lName = DOM.getCurrentName(); if( Util.isObject(pData) ){ - pData = DOM.stringifyJSON(pData); + pData = Util.stringifyJSON(pData); var lExt = '.json'; if( !Util.checkExtension(lName, lExt) ) @@ -849,31 +849,6 @@ var CloudCommander, Util, return lRefresh; }; - /** - * @pJSON - */ - DOM.parseJSON = function(pJSON){ - var lRet; - - Util.tryCatchLog(function(){ - lRet = JSON.parse(pJSON); - }); - - return lRet; - }; - - /** - * pObj - */ - DOM.stringifyJSON = function(pObj){ - var lRet; - - Util.tryCatLog(function(){ - lRet = JSON.stringify(pObj, null, 4); - }); - - return lRet; - }; /** * unified way to set current file diff --git a/lib/client/ie.js b/lib/client/ie.js index 8742f409..46454924 100644 --- a/lib/client/ie.js +++ b/lib/client/ie.js @@ -153,10 +153,10 @@ var Util, DOM, $; DOM.ajax = $.ajax; if(!window.JSON){ - DOM.parseJSON = $.parseJSON; + Util.parseJSON = $.parseJSON; /* https://gist.github.com/754454 */ - DOM.stringifyJSON = function(pObj){ + Util.stringifyJSON = function(pObj){ var lRet; if (!Util.isObject(pObj) || pObj === null) { @@ -187,7 +187,7 @@ var Util, DOM, $; } if(!window.localStorage){ - DOM.Cache = function(){ + var Cache = function(){ /* приватный переключатель возможности работы с кэшем */ var CacheAllowed, Data = {}; @@ -248,7 +248,7 @@ var Util, DOM, $; }; }; - DOM.Cache = new DOM.Cache(); + DOM.Cache = new Cache(); } diff --git a/lib/util.js b/lib/util.js index b5f712e8..c1af6b16 100644 --- a/lib/util.js +++ b/lib/util.js @@ -65,6 +65,32 @@ Util = exports || {}; return lRet; }; + /** + * @pJSON + */ + Util.parseJSON = function(pJSON){ + var lRet; + + Util.tryCatchLog(function(){ + lRet = JSON.parse(pJSON); + }); + + return lRet; + }; + + /** + * pObj + */ + Util.stringifyJSON = function(pObj){ + var lRet; + + Util.tryCatchLog(function(){ + lRet = JSON.stringify(pObj, null, 4); + }); + + return lRet; + }; + /* STRINGS */ /** * function check is strings are equal