From 0fa6fea33aa6e9a5db848f82a86ea7dff6d18ca9 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 21 Jan 2013 04:06:15 -0500 Subject: [PATCH] refactored --- lib/client/menu.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/client/menu.js b/lib/client/menu.js index a36c781c..c891e824 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -76,11 +76,13 @@ var CloudCommander, Util, DOM, $; DOM.getCurrentData(function(pParams){ var lObject = CloudCmd[pObjectName]; - if('init' in lObject) - lObject.uploadFile(pParams); - else - Util.exec(lObject, function(){ + Util.ifExec('init' in lObject, + function(){ CloudCmd[pObjectName].uploadFile(pParams); + }, + + function(pCallBack){ + Util.exec(lObject, pCallBack); }); }); @@ -157,8 +159,8 @@ var CloudCommander, Util, DOM, $; 'Download' : function(key, opt){ DOM.Images.showLoad(); - var lPath = DOM.getCurrentPath(), - lId = DOM.getIdBySrc(lPath); + var lPath = DOM.getCurrentPath(), + lId = DOM.getIdBySrc(lPath); Util.log('downloading file ' + lPath +'...'); @@ -284,13 +286,12 @@ var CloudCommander, Util, DOM, $; */ Menu.show = function(){ set(); - DOM.Images.hideLoad(); - if(Position && Position.x && Position.y) - $('li').contextMenu(Position); - else - $('li').contextMenu(); + if(Position && !Position.x ) + Position = null; + + $('li').contextMenu(Position); }; /* key binding function */