From 14b034bd16f22384f3ac0f43cb381a436aec39d1 Mon Sep 17 00:00:00 2001 From: will Date: Mon, 27 Dec 2010 16:32:13 -0800 Subject: [PATCH] Smoothed out the display of items in the middle menu. It was possible to click on menu items and have items listed from a click on a different menu items due to a race condition. --- ui/scripts/cloud.core.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index 08632c95c9d..dac05ac4b16 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -940,6 +940,7 @@ function getMidmenuId(jsonObj) { } var lastSearchType; +var currentCommandString; function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, page) { var params = { "commandString": commandString, @@ -956,9 +957,9 @@ function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, json (page > 1)? $("#midmenu_prevbutton").show(): $("#midmenu_prevbutton").hide(); - var $container = $("#midmenu_container").empty(); - if(isMultipleSelectionInMidMenu == true) - $container = createMultipleSelectionSubContainer(); + //var $container = $("#midmenu_container").empty(); + //if(isMultipleSelectionInMidMenu == true) + // $container = createMultipleSelectionSubContainer(); var count = 0; $.ajax({ @@ -966,7 +967,11 @@ function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, json data: createURL("command="+commandString+getSearchParamsFn()+"&pagesize="+midmenuItemCount+"&page="+page), dataType: "json", async: false, - success: function(json) { + success: function(json) { + var $container = $("#midmenu_container").empty(); + if(isMultipleSelectionInMidMenu == true) + $container = createMultipleSelectionSubContainer(); + selectedItemsInMidMenu = {}; var items = json[jsonResponse1][jsonResponse2]; if(items != null && items.length > 0) {