From 46469972622b4ce502ef86f17d8df3102e0b49ef Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 2 Oct 2013 13:27:20 +0000 Subject: [PATCH] fix(dom) Loader: this -> Loader --- lib/client/dom.js | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/lib/client/dom.js b/lib/client/dom.js index 4689a7c1..e63937bc 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -730,8 +730,6 @@ var CloudCmd, Util, DOM, CloudFunc; * @param pFunc - onload function */ this.anyLoadOnLoad = function(pParams_a, pFunc) { - var lRet = this; - if ( Util.isArray(pParams_a) ) { var lParam = pParams_a.pop(), lFunc = function() { @@ -742,19 +740,19 @@ var CloudCmd, Util, DOM, CloudFunc; lParam = { src : lParam }; else if ( Util.isArray(lParam) ) { - this.anyLoadInParallel(lParam, lFunc); + Loader.anyLoadInParallel(lParam, lFunc); } if (lParam && !lParam.func) { lParam.func = lFunc; - this.anyload(lParam); + Loader.anyload(lParam); }else Util.exec(pFunc); } - return lRet; + return Loader; }; /** @@ -766,8 +764,7 @@ var CloudCmd, Util, DOM, CloudFunc; * @param pFunc - onload function */ this.anyLoadInParallel = function(pParams_a, pFunc) { - var lRet = this, - lDone = [], + var lDone = [], lDoneFunc = function (pCallBack) { Util.exec(pCallBack); @@ -792,11 +789,11 @@ var CloudCmd, Util, DOM, CloudFunc; var lFunc = lParam.func; lParam.func = Util.retExec(lDoneFunc, lFunc); - this.anyload(lParam); + Loader.anyload(lParam); } } - return lRet; + return Loader; }; /** @@ -853,7 +850,7 @@ var CloudCmd, Util, DOM, CloudFunc; } /* убираем путь к файлу, оставляя только название файла */ if (!lID && lSrc) - lID = this.getIdBySrc(lSrc); + lID = DOM.getIdBySrc(lSrc); var lElement = DOMTree.getById(lID); @@ -953,7 +950,7 @@ var CloudCmd, Util, DOM, CloudFunc; * @param pFunc */ this.jsload = function(pSrc, pFunc) { - var lRet = this.anyload({ + var lRet = Loader.anyload({ name : 'script', src : pSrc, func : pFunc @@ -984,7 +981,7 @@ var CloudCmd, Util, DOM, CloudFunc; pParams_o.name = 'style'; pParams_o.parent = pParams_o.parent || document.head; - return this.anyload(pParams_o); + return Loader.anyload(pParams_o); }, /** @@ -1000,7 +997,7 @@ var CloudCmd, Util, DOM, CloudFunc; pParams_o[i].parent = pParams_o.parent || document.head; } - return this.anyload(pParams_o); + return Loader.anyload(pParams_o); } else if ( Util.isString(pParams_o) ) @@ -1009,7 +1006,7 @@ var CloudCmd, Util, DOM, CloudFunc; pParams_o.name = 'link'; pParams_o.parent = pParams_o.parent || document.head; - return this.anyload(pParams_o); + return Loader.anyload(pParams_o); }; /**