diff --git a/lib/client.js b/lib/client.js index 104bcb49..81bbdde7 100644 --- a/lib/client.js +++ b/lib/client.js @@ -303,8 +303,9 @@ var Util, DOM, CloudFunc, join; callback(); } - this.execFromModule = function(moduleName, funcName, params) { - var obj = CloudCmd[moduleName], + this.execFromModule = function(moduleName, funcName) { + var args = [].slice.call(arguments, 2), + obj = CloudCmd[moduleName], isObj = Util.type.object(obj); Util.exec.if(isObj, @@ -312,12 +313,8 @@ var Util, DOM, CloudFunc, join; var obj = CloudCmd[moduleName], func = obj[funcName]; - Util.exec(func, params); - }, - - function(callback) { - Util.exec(obj, callback); - }); + func.apply(null, args); + }, obj); }; this.refresh = function(panelParam, options, callback) { diff --git a/lib/client/menu.js b/lib/client/menu.js index bc947ec0..7b872c35 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -253,12 +253,10 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO; function uploadTo(nameModule) { Info.getData(function(error, data) { - var name = Info.name; + var name = Info.name, + execFrom = CloudCmd.execFromModule; - CloudCmd.execFromModule(nameModule, 'uploadFile', { - name: name, - data: data - }); + execFrom(nameModule, 'uploadFile', name, data); }); CloudCmd.log('Uploading to ' + name + '...'); diff --git a/lib/client/storage/_filepicker.js b/lib/client/storage/_filepicker.js index a1b5025f..bda08505 100644 --- a/lib/client/storage/_filepicker.js +++ b/lib/client/storage/_filepicker.js @@ -14,19 +14,15 @@ var CloudCmd, Util, DOM, filepicker; ]); } - - this.uploadFile = function(params) { - var content = params.data, - name = params.name, - log = console.log.bind(console); - - filepicker.store(content, { + this.uploadFile = function(name, data) { + var log = CloudCmd.log; + + filepicker.store(data, { mimetype: '', filename: name }, function(fpFile) { log(fpFile); - filepicker.exportFile(fpFile, log, log); }); };