diff --git a/cloudcmd.js b/cloudcmd.js index dbf24b75..8f1222ed 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -264,7 +264,7 @@ function getContent(name, callback) { dir.isDir(name, function(error, isDir) { var getDirContent = main.commander.getDirContent, - func = Util.retExec(callback); + func = Util.exec.ret(callback); if (!error && isDir) getDirContent(name, callback); diff --git a/lib/client/config.js b/lib/client/config.js index 9c9d65bb..8812cbc9 100644 --- a/lib/client/config.js +++ b/lib/client/config.js @@ -48,7 +48,7 @@ var CloudCmd, Util, DOM; function cssLoad(callback) { DOM.cssLoad({ src : '/css/config.css', - func: Util.retExec(callback) + func: Util.exec.ret(callback) }); } diff --git a/lib/client/edit.js b/lib/client/edit.js index 35d4e676..6ace1d3b 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -360,7 +360,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI function getEditConfig(callback) { var CONFIG_PATH = '/json/edit.json', - func = Util.retExec(callback); + func = Util.exec.ret(callback); Util.exec.if(EditConfig, function() { func(EditConfig); @@ -495,7 +495,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI Msg.innerHTML = text; DOM.show(Msg); - setTimeout(Util.retExec(DOM.hide, Msg), HIDE_TIME); + setTimeout(Util.exec.ret(DOM.hide, Msg), HIDE_TIME); }; init(); diff --git a/lib/client/storage/_dropbox.js b/lib/client/storage/_dropbox.js index 0f0a465d..fab7a1e9 100644 --- a/lib/client/storage/_dropbox.js +++ b/lib/client/storage/_dropbox.js @@ -13,7 +13,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dropbox, cb, Client; load, DropBoxStore.login, getUserData, - Util.retExec(pCallBack) + Util.exec.ret(pCallBack) ]); } diff --git a/lib/client/storage/_gdrive.js b/lib/client/storage/_gdrive.js index 2ea26b6c..75157095 100644 --- a/lib/client/storage/_gdrive.js +++ b/lib/client/storage/_gdrive.js @@ -35,7 +35,7 @@ var CloudCmd, Util, DOM, gapi; gapi.auth.authorize(lParams, function(pAuthResult){ if (pAuthResult && !pAuthResult.error) - gapi.client.load('drive', 'v2', Util.retExec(callback)); + gapi.client.load('drive', 'v2', Util.exec.ret(callback)); }); }, 1500); @@ -96,10 +96,10 @@ var CloudCmd, Util, DOM, gapi; }; - GDrive.init = function(pCallBack){ + GDrive.init = function(callback) { Util.loadOnLoad([ load, - Util.retExec(pCallBack) + Util.exec.ret(callback) ]); }; diff --git a/lib/client/storage/_github.js b/lib/client/storage/_github.js index d6aecf31..9ca40586 100644 --- a/lib/client/storage/_github.js +++ b/lib/client/storage/_github.js @@ -14,18 +14,18 @@ var CloudCmd, Util, DOM, CloudFunc, Github, cb; cb = function (err, data) { Util.log(err || data);}; - function init(pCallBack) { + function init(callback) { Util.loadOnLoad([ load, GitHub.autorize, GitHub.getUserData, - Util.retExec(pCallBack) + Util.exec.ret(callback) ]); GitHub.callback = function() { Util.loadOnLoad([ GitHub.getUserData, - Util.retExec(pCallBack) + Util.exec.ret(callback) ]); }; } diff --git a/lib/client/storage/_skydrive.js b/lib/client/storage/_skydrive.js index c7caadb2..66c5fffc 100644 --- a/lib/client/storage/_skydrive.js +++ b/lib/client/storage/_skydrive.js @@ -65,11 +65,11 @@ var CloudCmd, Util, DOM, WL; }); } - SkyDrive.init = function(pCallBack){ + SkyDrive.init = function(callback) { Util.loadOnLoad([ load, auth, - Util.retExec(pCallBack) + Util.exec.ret(callback) ]); }; diff --git a/lib/client/storage/_vk.js b/lib/client/storage/_vk.js index 5c763761..b4c7dd0b 100644 --- a/lib/client/storage/_vk.js +++ b/lib/client/storage/_vk.js @@ -83,11 +83,11 @@ var CloudCmd, Util, DOM, VK; }); }; - VKStorage.init = function(pCallBack){ + VKStorage.init = function(callback) { Util.loadOnLoad([ load, auth, - Util.retExec(pCallBack) + Util.exec.ret(callback) ]); }; diff --git a/lib/server.js b/lib/server.js index 72c40b22..922242e7 100644 --- a/lib/server.js +++ b/lib/server.js @@ -263,7 +263,7 @@ } } - func = Util.retExec(callback, names); + func = Util.exec.ret(callback, names); Util.exec.if(!config.minify, func, function(callback) { Util.exec.parallel(funcs, callback); diff --git a/lib/server/pipe.js b/lib/server/pipe.js index f0aad695..070c798e 100644 --- a/lib/server/pipe.js +++ b/lib/server/pipe.js @@ -24,7 +24,7 @@ function create(params) { var gzip, read, write, isFsWrite, p = params, - func = Util.retExec(p.callback), + func = Util.exec.ret(p.callback), options = { bufferSize: 4 * 1024 }; @@ -84,7 +84,7 @@ }); readStream.on('error', function(error) { - Util.retExec(callback, error); + Util.exec.ret(callback, error); }); readStream.on('end', function() { diff --git a/lib/server/rest.js b/lib/server/rest.js index 3c58b2f2..a13e687f 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -431,7 +431,7 @@ names = []; } - process = Util.retExec(callbackProcess, from); + process = Util.exec.ret(callbackProcess, from); if (isLast) Util.exec(callback, null); diff --git a/lib/server/rest/fs/delete.js b/lib/server/rest/fs/delete.js index 44d49a6b..ae30c3e3 100644 --- a/lib/server/rest/fs/delete.js +++ b/lib/server/rest/fs/delete.js @@ -13,7 +13,7 @@ exports.onDelete = onDelete; function onDelete(name, files, query, callback) { - var func = Util.retExec(callback), + var func = Util.exec.ret(callback), fileNames = Util.slice(files), rmFile = fs.unlink, rmDir = fse.delete; diff --git a/lib/server/rest/fs/get.js b/lib/server/rest/fs/get.js index 0229cca5..2a3604ec 100644 --- a/lib/server/rest/fs/get.js +++ b/lib/server/rest/fs/get.js @@ -13,7 +13,7 @@ function onGet(query, name, callback) { var error, hash, - func = Util.retExec(callback); + func = Util.exec.ret(callback); switch (query) { case 'size': diff --git a/lib/server/rest/fs/put.js b/lib/server/rest/fs/put.js index 720e07b1..245774f6 100644 --- a/lib/server/rest/fs/put.js +++ b/lib/server/rest/fs/put.js @@ -16,7 +16,7 @@ exports.onPut = onPut; function onPut(name, query, readStream, callback) { - var func = Util.retExec(callback), + var func = Util.exec.ret(callback), baseName = path.basename(name); switch(query) { diff --git a/lib/util.js b/lib/util.js index 839130a7..d575facc 100644 --- a/lib/util.js +++ b/lib/util.js @@ -644,21 +644,6 @@ return type; }; - /** - * return save exec function - * @param callback - */ - this.retExec = function() { - var result, - exec = Util.exec.bind(Util), - args = Util.slice(arguments); - - args.unshift(exec); - result = Util.bind.apply(null, args); - - return result; - }; - /** * function return false */ @@ -806,6 +791,21 @@ return ret; }; + /** + * return save exec function + * @param callback + */ + exec.ret = function() { + var result, + exec = Util.exec.bind(Util), + args = Util.slice(arguments); + + args.unshift(exec); + result = Util.bind.apply(null, args); + + return result; + }; + /** * function do conditional save exec of function * @param condition @@ -865,7 +865,7 @@ allData[num] = data[0]; if (count === funcsCount) - Util.retExec(callback).apply(null, allData); + exec.ret(callback).apply(null, allData); } function callCheckFunc(num, func) {