From cd2846ef5fea190d79c400fb6b50649074a1dc32 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 30 Dec 2013 08:15:57 +0000 Subject: [PATCH] refactor(view) View: this -> Util.exec --- lib/client/config.js | 10 +--------- lib/client/console.js | 9 +-------- lib/client/edit.js | 9 +-------- lib/client/view.js | 16 ++++++++++------ 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/lib/client/config.js b/lib/client/config.js index 42d95406..4f31c121 100644 --- a/lib/client/config.js +++ b/lib/client/config.js @@ -16,23 +16,15 @@ var CloudCmd, Util, DOM; Config = this; function init(pCallBack) { - var func, - isFunc = Util.isFunction(CloudCmd.View); - Loading = true; - if (isFunc) - func = CloudCmd.View; - else - func = Util.exec; - Util.loadOnLoad([ Config.show, function(callback) { Loading = false; Util.exec(callback); }, - func, + CloudCmd.View, ]); DOM.Events.addKey(listener); diff --git a/lib/client/console.js b/lib/client/console.js index ab0dae3f..92a79499 100644 --- a/lib/client/console.js +++ b/lib/client/console.js @@ -21,19 +21,12 @@ var CloudCmd, Util, DOM, CloudFunc, $; Console = this; function init() { - var lFunc, lIsFunc = Util.isFunction(CloudCmd.View); - Loading = true; - if (lIsFunc) - lFunc = CloudCmd.View; - else - lFunc = Util.exec; - Util.loadOnLoad([ Console.show, load, - lFunc, + CloudCmd.View, DOM.jqueryLoad, DOM.socketLoad ]); diff --git a/lib/client/edit.js b/lib/client/edit.js index a593aacf..b973539c 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -23,18 +23,11 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch; Element; function init() { - var lFunc, lIsFunc = Util.isFunction(CloudCmd.View); - Loading = true; - if (lIsFunc) - lFunc = CloudCmd.View; - else - lFunc = Util.exec; - Util.loadOnLoad([ Edit.show, load, - lFunc + CloudCmd.View ]); DOM.Events.addKey(listener); diff --git a/lib/client/view.js b/lib/client/view.js index 561f2d2c..9d605712 100644 --- a/lib/client/view.js +++ b/lib/client/view.js @@ -11,7 +11,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; Info = DOM.CurrentInfo, Key = CloudCmd.Key, Images = DOM.Images, - View = this, + View = Util.exec, Element, Config = { @@ -43,6 +43,9 @@ var CloudCmd, Util, DOM, CloudFunc, $; padding : 0 }; + View.show = show; + View.hide = hide; + function init() { var lFunc, lIsFunc, lIsCallBack; @@ -71,7 +74,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; /** * function shows FancyBox */ - this.show = function(pData, pCallBack, pConfig) { + function show(pData, pCallBack, pConfig) { var lPath, lElement, lAfterFunc, lFunc, name, config = {}; @@ -107,15 +110,14 @@ var CloudCmd, Util, DOM, CloudFunc, $; }); } } - }; + } - this.hide = function() { + function hide() { $.fancybox.close(); - }; + } /** * function loads css and js of FancyBox - * @pParent - this * @pCallBack - executes, when everything loaded */ function load(pCallBack) { @@ -171,6 +173,8 @@ var CloudCmd, Util, DOM, CloudFunc, $; } init(); + + return View; } })(CloudCmd, Util, DOM, CloudFunc);