diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 138a31d9e97..e2d12c5e167 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -40,15 +40,7 @@ $(document).ready(function() { } } }); - - var $rightPanel = $("#right_panel"); - var $addLink = $("#add_link"); - //var $actionLink = $("#action_link"); - //var $actionMenu = $("#action_menu"); - //var $actionList = $("#action_menu #action_list"); - var $midmenuContainer = $("#midmenu_container"); - //var $actionListItem = $("#action_list_item"); - + $("#leftmenu_instance_group_header").bind("click", function(event) { var $arrowIcon = $(this).find("#arrow_icon"); clickInstanceGroupHeader($arrowIcon); @@ -75,14 +67,16 @@ $(document).ready(function() { data: createURL("command="+apiName+"&response=json"), dataType: "json", success: function(json) { - $midmenuContainer.empty(); + $("#midmenu_container").empty(); + selectedItemsInMidMenu = {}; + var items = json[jsonResponse1][jsonResponse2]; if(items != null && items.length > 0) { for(var i=0; i0) { - var $groupTemplate = $instanceGroupTemplate.clone().show(); + var $groupTemplate = $("#leftmenu_instance_group_template").clone().show(); $groupTemplate.find("#group_name").text(instanceGroupArray[i]); $groupTemplate.bind("click", function(event) { //$(this).removeClass("leftmenu_content").addClass("leftmenu_content_selected"); $("#midmenu_container").empty(); + selectedItemsInMidMenu = {}; + var groupName = $(this).find("#group_name").text(); $.ajax({ @@ -511,7 +505,7 @@ function clickInstanceGroupHeader($arrowIcon) { return false; }); - $instanceGroupContainer.append($groupTemplate); + $("#leftmenu_instance_group_container").append($groupTemplate); } } @@ -525,7 +519,7 @@ function clickInstanceGroupHeader($arrowIcon) { } else if($arrowIcon.hasClass("open") == true) { $arrowIcon.removeClass("open").addClass("close"); - $instanceGroupContainer.empty(); + $("#leftmenu_instance_group_container").empty(); } //***** VM Detail (end) ******************************************************************************** $("#right_panel").load("jsp/instance.jsp", function() { diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 0354df139d4..2ef6d2858f8 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -163,7 +163,6 @@ function doActionForMidMenu(id, $actionLink, apiCommand, listAPIMap) { } function handleErrorInMidMenu(XMLHttpResponse, $midmenuItem) { - debugger; $midmenuItem.find("#content").removeClass("inaction"); $midmenuItem.find("#spinning_wheel").hide(); $midmenuItem.find("#info_icon").addClass("error").show();