From b64e75ecd4ef9be6af0d5a85de6d7c7ab8e3420c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 18 Feb 2011 12:22:41 -0800 Subject: [PATCH] Multiple-selection page: apply clickItemInMultipleSelectionMidmenu() in createMultipleSelectionSubContainer(). --- ui/scripts/cloud.core.js | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index 6e61996722b..cd1ddd680e0 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -532,20 +532,6 @@ function hideDetailsTabActionSpinningWheel(id, inProcessText, $midmenuItem1) { } } -/* -If Cancel button in dialog is clicked, action won't preceed. -i.e. doActionToMidMenu() won't get called => highlight won't be removd from middle menu. -So, we need to remove highlight here. Otherwise, it won't be consistent of selectedItemsInMidMenu which will be emptied soon. -*/ -/* -function removeHighlightInMiddleMenu(selectedItemsInMidMenu) { - for(var id in selectedItemsInMidMenu) { - var $midmenuItem1 = $("#midmenuItem_"+id); - $midmenuItem1.find("#content").removeClass("selected"); - } -} -*/ - function copyActionInfoFromMidMenuToRightPanel($midmenuItem1) { var $afterActionInfoContainer = $("#right_panel_content #after_action_info_container_on_top"); @@ -810,8 +796,10 @@ function bindClickToMidMenu($midmenuItem1, toRightPanelFn, getMidmenuIdFn) { }); } function clickItemInMultipleSelectionMidmenu($midmenuItem1) { - $midmenuItem1.find("#content").addClass("selected"); //css of vmops - $midmenuItem1.addClass("ui-selected"); //css of JQuery selectable widget + $midmenuItem1.find("#content").addClass("selected"); //"selected" is a CSS class in cloudstack-defined CSS + + if($midmenuItem1.hasClass("ui-selected") == false) //"ui-selected" is a CSS class in JQuery selectable widget + $midmenuItem1.addClass("ui-selected"); clearRightPanel(); var toRightPanelFn = $midmenuItem1.data("toRightPanelFn"); @@ -824,6 +812,7 @@ function clickItemInMultipleSelectionMidmenu($midmenuItem1) { $currentMidmenuItem = $midmenuItem1; } + function switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray) { for(var tabIndex=0; tabIndex