Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-18 00:47:01 +00:00
Code Issues Projects Releases Wiki Activity

feature(util) retExec -> exec.ret

Browse source
This commit is contained in:
coderaiser 2014-05-23 03:01:33 -04:00
parent 58a3a6ff3e
commit 7332c7b325
15 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cloudcmd.js
View file

@ -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);

2
lib/client/config.js
View file

@ -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)
});
}

4
lib/client/edit.js
View file

@ -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();

2
lib/client/storage/_dropbox.js
View file

@ -13,7 +13,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dropbox, cb, Client;
load,
DropBoxStore.login,
getUserData,
Util.retExec(pCallBack)
Util.exec.ret(pCallBack)
]);
}

6
lib/client/storage/_gdrive.js
View file

@ -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)
]);
};

6
lib/client/storage/_github.js
View file

@ -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)
]);
};
}

4
lib/client/storage/_skydrive.js
View file

@ -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)
]);
};

4
lib/client/storage/_vk.js
View file

@ -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)
]);
};

2
lib/server.js
View file

@ -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);

4
lib/server/pipe.js
View file

@ -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() {

2
lib/server/rest.js
View file

@ -431,7 +431,7 @@
names = [];
}
process = Util.retExec(callbackProcess, from);
process = Util.exec.ret(callbackProcess, from);
if (isLast)
Util.exec(callback, null);

2
lib/server/rest/fs/delete.js
View file

@ -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;

2
lib/server/rest/fs/get.js
View file

@ -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':

2
lib/server/rest/fs/put.js
View file

@ -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) {

32
lib/util.js
View file

@ -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) {