new UI - middle menu actions - If Cancel button in dialog box is clicked, remove highlight in middle menu.

This commit is contained in:
Jessica Wang 2010-10-06 12:05:17 -07:00
parent a0f75f34c1
commit 1ecfdae8f0
2 changed files with 21 additions and 0 deletions

View File

@ -794,6 +794,7 @@ function doAttachISO($t, selectedItemsInMidMenu, vmListAPIMap) {
},
"Cancel": function() {
$(this).dialog("close");
removeHighlightInMiddleMenu(selectedItemsInMidMenu);
}
}).dialog("open");
}
@ -810,6 +811,7 @@ function doDetachISO($t, selectedItemsInMidMenu, vmListAPIMap) {
},
"Cancel": function() {
$(this).dialog("close");
removeHighlightInMiddleMenu(selectedItemsInMidMenu);
}
}).dialog("open");
}
@ -837,6 +839,7 @@ function doResetPassword($t, selectedItemsInMidMenu, vmListAPIMap) {
},
"No": function() {
$(this).dialog("close");
removeHighlightInMiddleMenu(selectedItemsInMidMenu);
}
}).dialog("open");
}
@ -917,6 +920,7 @@ function doChangeName($t, selectedItemsInMidMenu, vmListAPIMap) {
},
"Cancel": function() {
$(this).dialog("close");
removeHighlightInMiddleMenu(selectedItemsInMidMenu);
}
}).dialog("open");
}
@ -980,6 +984,7 @@ function doChangeService($t, selectedItemsInMidMenu, vmListAPIMap) {
},
"Cancel": function() {
$(this).dialog("close");
removeHighlightInMiddleMenu(selectedItemsInMidMenu);
}
}).dialog("open");
}
@ -1006,6 +1011,7 @@ function doChangeGroup($t, selectedItemsInMidMenu, vmListAPIMap) {
},
"Cancel": function() {
$(this).dialog("close");
removeHighlightInMiddleMenu(selectedItemsInMidMenu);
}
}).dialog("open");
}
@ -1024,6 +1030,7 @@ function doEnableHA($t, selectedItemsInMidMenu, vmListAPIMap) {
},
"Cancel": function() {
$(this).dialog("close");
removeHighlightInMiddleMenu(selectedItemsInMidMenu);
}
}).dialog("open");
}
@ -1042,6 +1049,7 @@ function doDisableHA($t, selectedItemsInMidMenu, vmListAPIMap) {
},
"Cancel": function() {
$(this).dialog("close");
removeHighlightInMiddleMenu(selectedItemsInMidMenu);
}
}).dialog("open");
}

View File

@ -215,12 +215,25 @@ function buildActionLinkForMidMenu(label, actionMap, $actionMenu, listAPIMap) {
}
else {
dialogBeforeActionFn($actionLink, selectedItemsInMidMenu, listAPIMap);
}
selectedItemsInMidMenu = {}; //clear selected items for action
return false;
});
}
/*
If Cancel button in dialog is clicked, action won't preceed.
i.e. doActionForMidMenu() 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 $midmenuItem = $("#midmenuItem_"+id);
$midmenuItem.find("#content").removeClass("selected");
}
}
function doActionForMidMenu(id, $actionLink, apiCommand, listAPIMap) {
var label = $actionLink.data("label");
var isAsyncJob = $actionLink.data("isAsyncJob");