From fe570f2c902ccf093d6dcffc90b29404ab189153 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 29 Jan 2014 10:18:18 -0500 Subject: [PATCH] feature(loader) pop -> shift --- lib/client/edit.js | 17 +++++++---------- lib/client/loader.js | 2 +- lib/client/view.js | 17 ++++++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/client/edit.js b/lib/client/edit.js index 91dac49b..d615d1ef 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -222,10 +222,8 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch; }); } - function load(pCallBack) { - Util.time(Name + ' load'); - - var lFiles = [ + function load(callback) { + var files = [ DIR + 'theme-tomorrow_night_blue.js', DIR + 'ext-language_tools.js', DIR + 'ext-searchbox.js', @@ -233,19 +231,18 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch; DIR + 'ext-emmet.js' ], - lAce = DIR + 'ace.js', - lURL = CloudFunc.getJoinURL(lFiles); + ace = DIR + 'ace.js', + url = CloudFunc.getJoinURL(files); + Util.time(Name + ' load'); - DOM.anyLoadOnLoad([lURL, lAce], function() { + DOM.anyLoadOnLoad([ace, url], function() { Util.timeEnd(Name + ' load'); Loading = false; - Util.exec(pCallBack); + Util.exec(callback); }); } - - function onSave(text) { var ret, isError = Util.isContainStrAtBegin(text, 'error'), diff --git a/lib/client/loader.js b/lib/client/loader.js index 15b472d9..0e57b326 100644 --- a/lib/client/loader.js +++ b/lib/client/loader.js @@ -112,7 +112,7 @@ var Util, DOM; */ this.anyLoadOnLoad = function(params, callback) { if (Util.isArray(params)) { - var param = params.pop(), + var param = params.shift(), func = function() { Loader.anyLoadOnLoad(params, callback); }; diff --git a/lib/client/view.js b/lib/client/view.js index 058ac089..f5bd36e2 100644 --- a/lib/client/view.js +++ b/lib/client/view.js @@ -126,16 +126,19 @@ var CloudCmd, Util, DOM, CloudFunc, $; * function loads css and js of FancyBox * @pCallBack - executes, when everything loaded */ - function load(pCallBack) { - Util.time(Name + ' load'); - var lDir = CloudCmd.LIBDIRCLIENT + 'view/fancyBox/source/', - lFiles = [ lDir + 'jquery.fancybox.css', - lDir + 'jquery.fancybox.js' ]; + function load(callback) { + var dir = CloudCmd.LIBDIRCLIENT + 'view/fancyBox/source/', + files = [ + dir + 'jquery.fancybox.css', + dir + 'jquery.fancybox.js' + ]; - DOM.anyLoadOnLoad([lFiles], function() { + Util.time(Name + ' load'); + + DOM.anyLoadOnLoad([files], function() { Util.timeEnd(Name + ' load'); Loading = false; - Util.exec( pCallBack ); + Util.exec(callback); Images.hideLoad(); }) .cssSet({id:'view-css',