From c969fa59bae732afb1345a5910ceb5ab555cf0b9 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 11 Apr 2014 09:52:06 -0400 Subject: [PATCH] refactor(menu) getConfig --- lib/client/menu.js | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/lib/client/menu.js b/lib/client/menu.js index 6c38a27f..5da680a2 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -177,8 +177,15 @@ var CloudCmd, Util, DOM, CloudFunc, $; * function return configureation for menu */ function getConfig () { - var lRet, - lMenuItems = { + var ret, + show = function(name) { + var module = CloudCmd[name], + ret = Util.exec(module); + + if (!ret) + Util.exec(module.show); + }, + menuItems = { 'View' : Util.bind(show, 'View'), 'Edit' : Util.bind(show, 'Edit'), 'Rename' : function() { @@ -191,11 +198,11 @@ var CloudCmd, Util, DOM, CloudFunc, $; }; if (UploadToItemNames.length) - lMenuItems['Upload to'] = getUploadToItems(UploadToItemNames); + menuItems['Upload to'] = getUploadToItems(UploadToItemNames); - lMenuItems.Download = downloadFromMenu; + menuItems.Download = downloadFromMenu; - lMenuItems.New = { + menuItems.New = { 'File' : DOM.promptNewFile, 'Directory' : DOM.promptNewDir, @@ -204,20 +211,20 @@ var CloudCmd, Util, DOM, CloudFunc, $; top: true }); - CloudCmd.execFromModule('FilePicker', 'saveFile', function(pName, pData) { - var lPath = DOM.getCurrentDirPath() + pName; + CloudCmd.execFromModule('FilePicker', 'saveFile', function(name, data) { + var path = DOM.getCurrentDirPath() + name; - DOM.RESTful.write(lPath, pData, CloudCmd.refresh); + DOM.RESTful.write(path, data, CloudCmd.refresh); }); } }; - lRet = { + ret = { // define which elements trigger this menu selector: 'li', // define the elements of the menu - items : getAllItems(lMenuItems), + items : getAllItems(menuItems), events :{ hide: function() { var event = window.event; @@ -230,15 +237,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; } }; - return lRet; - - function show(name) { - var module = CloudCmd[name], - ret = Util.exec(module); - - if (!ret) - Util.exec(module.show); - } + return ret; } /** function loads css and js of Menu