From 58a3a6ff3e6f0a5572d0dc8018a99ccab4514919 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 23 May 2014 02:48:48 -0400 Subject: [PATCH] feature(util) ifExec -> exec.if --- cloudcmd.js | 2 +- lib/client.js | 10 +++++----- lib/client/dom.js | 6 +++--- lib/client/edit.js | 16 ++++++++-------- lib/client/key.js | 2 +- lib/server.js | 4 ++-- lib/server/commander.js | 2 +- lib/server/join.js | 2 +- lib/server/main.js | 2 +- lib/server/pipe.js | 2 +- lib/server/rest.js | 2 +- lib/server/rest/fs/delete.js | 2 +- lib/util.js | 34 +++++++++++++++++----------------- 13 files changed, 43 insertions(+), 43 deletions(-) diff --git a/cloudcmd.js b/cloudcmd.js index 6ae97bcd..dbf24b75 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -276,7 +276,7 @@ function readIndex(json, callback) { var isMinify = Minify && Config.minify; - Util.ifExec(!isMinify, function(error, params) { + Util.exec.if(!isMinify, function(error, params) { var name = params && params.name; fs.readFile(name || INDEX_PATH, 'utf8', function(error, template) { diff --git a/lib/client.js b/lib/client.js index 6bdbc0fa..1fd7c2d7 100644 --- a/lib/client.js +++ b/lib/client.js @@ -165,7 +165,7 @@ var Util, DOM, CloudFunc; }); }; - Util.ifExec(document.body.scrollIntoViewIfNeeded, callback, func); + Util.exec.if(document.body.scrollIntoViewIfNeeded, callback, func); }; this.route = function(path) { @@ -191,7 +191,7 @@ var Util, DOM, CloudFunc; }; function initModules(callback) { - Util.ifExec(CloudCmd.Key, function() { + Util.exec.if(CloudCmd.Key, function() { Key = new CloudCmd.Key(); CloudCmd.Key = Key; Key.bind(); @@ -296,7 +296,7 @@ var Util, DOM, CloudFunc; function getSystemFile(pGlobal, pURL) { function lGetSysFile(callback) { - Util.ifExec(pGlobal, callback, function() { + Util.exec.if(pGlobal, callback, function() { DOM.ajax({ url : pURL, success : function(pLocal) { @@ -312,7 +312,7 @@ var Util, DOM, CloudFunc; this.setConfig = function(config) { Config = config; }; this.getConfig = function(callback) { - Util.ifExec(Config, callback, function() { + Util.exec.if(Config, callback, function() { var RESTful = DOM.RESTful; RESTful.Config.read(function(config) { @@ -332,7 +332,7 @@ var Util, DOM, CloudFunc; var obj = CloudCmd[moduleName], isObj = Util.isObject(obj); - Util.ifExec(isObj, + Util.exec.if(isObj, function() { var obj = CloudCmd[moduleName], func = obj[funcName]; diff --git a/lib/client/dom.js b/lib/client/dom.js index 0e0a00d7..89fce0df 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -599,7 +599,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; CloudCmd.getConfig(function(config) { var online = config.online && navigator.onLine; - Util.ifExec(!online, + Util.exec.if(!online, function() { DOM.jsload('/lib/client/jquery.js', { onload: callback @@ -1014,7 +1014,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; RESTful.read(path + '?json', func); else DOM.checkStorageHash(path, function(error, equal, hashNew) { - Util.ifExec(!error && equal, function() { + Util.exec.if(!error && equal, function() { DOM.getDataFromStorage(path, callback); }, function() { hash = hashNew; @@ -1442,7 +1442,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; if (!allowed || isDir) Util.exec(callback); else - Util.ifExec(hash, function() { + Util.exec.if(hash, function() { var Storage = DOM.Storage; Storage.set(nameHash, hash); diff --git a/lib/client/edit.js b/lib/client/edit.js index 796e1ca1..35d4e676 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -91,7 +91,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI setEmmet(isHTML); - Util.ifExec(isStr, function() { + Util.exec.if(isStr, function() { var UndoManager = ace.require('ace/undomanager').UndoManager; Ace.setValue(Value); @@ -155,7 +155,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI isEmmet = extensions.emmet; if (isEmmet) - Util.ifExec(Emmet, function() { + Util.exec.if(Emmet, function() { if (Emmet) Ace.setOption('enableEmmet', isHTML); }, function(callback) { @@ -241,7 +241,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI var isDiff = config.diff, isZip = config.zip; - Util.ifExec(!isDiff, function(patch) { + Util.exec.if(!isDiff, function(patch) { var query = '', MAX_SIZE = CloudFunc.MAX_FILE_SIZE, patchLength = patch.length, @@ -257,7 +257,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI else patch = false; - Util.ifExec(!isZip || query, function(equal, data) { + Util.exec.if(!isZip || query, function(equal, data) { var result = data || patch || Value, url = path + query; @@ -282,7 +282,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI diff(value, function(patch) { var isAllowed = DOM.Storage.isAllowed(); - Util.ifExec(!isAllowed, callback, function(func) { + Util.exec.if(!isAllowed, callback, function(func) { DOM.checkStorageHash(path, function(error, equal) { if (!equal) patch = ''; @@ -307,7 +307,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI if (!Diff) Diff = new DiffProto(diff_match_patch); - Util.ifExec(!isAllowed, function() { + Util.exec.if(!isAllowed, function() { patch = Diff.createPatch(Value, newValue); Util.exec(callback, patch); }, function(func) { @@ -347,7 +347,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI Util.exec(callback); }; - Util.ifExec(JSHintConfig, func, function() { + Util.exec.if(JSHintConfig, func, function() { DOM.ajax({ url : JSHINT_PATH, success : function(data) { @@ -362,7 +362,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI var CONFIG_PATH = '/json/edit.json', func = Util.retExec(callback); - Util.ifExec(EditConfig, function() { + Util.exec.if(EditConfig, function() { func(EditConfig); }, function() { DOM.ajax({ diff --git a/lib/client/key.js b/lib/client/key.js index 7a4a38b9..7b97f19e 100644 --- a/lib/client/key.js +++ b/lib/client/key.js @@ -284,7 +284,7 @@ var CloudCmd, Util, DOM; else isSelected = DOM.isSelected(current); - Util.ifExec(isSelected, function() { + Util.exec.if(isSelected, function() { DOM.toggleSelectedFile(current); }, function(callback) { DOM.loadCurrentSize(callback, current); diff --git a/lib/server.js b/lib/server.js index f6f07758..72c40b22 100644 --- a/lib/server.js +++ b/lib/server.js @@ -212,7 +212,7 @@ check = checkExt(name); result = isMin && check; - Util.ifExec(!result, + Util.exec.if(!result, function(error, params) { var sendName = params && params.name || name; @@ -265,7 +265,7 @@ func = Util.retExec(callback, names); - Util.ifExec(!config.minify, func, function(callback) { + Util.exec.if(!config.minify, func, function(callback) { Util.exec.parallel(funcs, callback); }); } diff --git a/lib/server/commander.js b/lib/server/commander.js index 3a21cf31..82b3e9c3 100644 --- a/lib/server/commander.js +++ b/lib/server/commander.js @@ -155,7 +155,7 @@ } function changeUIDToName(json, callback) { - Util.ifExec(WIN32, callback, + Util.exec.if(WIN32, callback, function(callback) { users.getNames(function(error, names) { var i, n, current, owner, diff --git a/lib/server/join.js b/lib/server/join.js index 6441f6fa..d0a3b367 100644 --- a/lib/server/join.js +++ b/lib/server/join.js @@ -20,7 +20,7 @@ else { names = CloudFunc.getJoinArray(path); - Util.ifExec(!before, readFunc, function(callback) { + Util.exec.if(!before, readFunc, function(callback) { before(names, callback); }); } diff --git a/lib/server/main.js b/lib/server/main.js index fe1de8b7..8601cf31 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -355,7 +355,7 @@ Util.log(data); /* если браузер поддерживает gzip-сжатие - сжимаем данные*/ - Util.ifExec(!isGzip, + Util.exec.if(!isGzip, function() { p.status = params.status || p.status; diff --git a/lib/server/pipe.js b/lib/server/pipe.js index f7ef22e6..f0aad695 100644 --- a/lib/server/pipe.js +++ b/lib/server/pipe.js @@ -58,7 +58,7 @@ write.on('error', func); read.on('error', func); - Util.ifExec(!isFsWrite, function() { + Util.exec.if(!isFsWrite, function() { read.pipe(write, { end: !p.notEnd }); diff --git a/lib/server/rest.js b/lib/server/rest.js index 397e7640..3c58b2f2 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -440,7 +440,7 @@ if (error) Util.exec(callback, error); else - Util.ifExec(!isFunc, copy, process); + Util.exec.if(!isFunc, copy, process); }); }; diff --git a/lib/server/rest/fs/delete.js b/lib/server/rest/fs/delete.js index 31bfb72f..44d49a6b 100644 --- a/lib/server/rest/fs/delete.js +++ b/lib/server/rest/fs/delete.js @@ -45,7 +45,7 @@ if (isLast) callback(null); else - Util.ifExec(rimraf, function(result, func) { + Util.exec.if(rimraf, function(result, func) { (func || rimraf)(from + name, function(error) { if (error) callback(error); diff --git a/lib/util.js b/lib/util.js index d736e53d..839130a7 100644 --- a/lib/util.js +++ b/lib/util.js @@ -806,6 +806,23 @@ return ret; }; + /** + * function do conditional save exec of function + * @param condition + * @param callback + * @param func + */ + exec.if = function(condition, callback, func) { + var ret; + + if (condition) + Util.exec(callback, condition); + else + Util.exec(func, callback); + + return ret; + }; + /** * exec function if it exist in object * @pArg @@ -861,23 +878,6 @@ return exec; } - /** - * function do conditional save exec of function - * @param pCondition - * @param pCallBack - * @param pFunc - */ - this.ifExec = function(pCondition, pCallBack, pFunc) { - var ret; - - if (pCondition) - Util.exec(pCallBack, pCondition); - else - Util.exec(pFunc, pCallBack); - - return ret; - }; - /** * function gets file extension * @param pFileName