diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js index 2f90f04a1bc..6c93ed881cd 100644 --- a/ui/scripts/cloud.core.cluster.js +++ b/ui/scripts/cloud.core.cluster.js @@ -103,12 +103,12 @@ var clusterActionMap = { inProcessText: "Deleting Cluster....", afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp("slow", function() { - $(this).remove(); - }); - if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { - clearRightPanel(); - clusterClearRightPanel(); - } + $(this).remove(); + if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { + clearRightPanel(); + clusterClearRightPanel(); + } + }); } } } diff --git a/ui/scripts/cloud.core.domain.js b/ui/scripts/cloud.core.domain.js index 2ad3b8a43a0..e4dcfc82a34 100644 --- a/ui/scripts/cloud.core.domain.js +++ b/ui/scripts/cloud.core.domain.js @@ -631,12 +631,12 @@ var domainActionMap = { inProcessText: "Deleting Domain....", afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp(function() { - $(this).remove(); - }); - if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { - clearRightPanel(); - domainJsonClearRightPanel(); - } + $(this).remove(); + if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { + clearRightPanel(); + domainJsonClearRightPanel(); + } + }); } } } \ No newline at end of file diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js index 394ca760e30..4424a229fed 100644 --- a/ui/scripts/cloud.core.host.js +++ b/ui/scripts/cloud.core.host.js @@ -679,12 +679,12 @@ var hostActionMap = { inProcessText: "Removing Host....", afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp("slow", function() { - $(this).remove(); - }); - if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { - clearRightPanel(); - hostClearRightPanel(); - } + $(this).remove(); + if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { + clearRightPanel(); + hostClearRightPanel(); + } + }); } }, "Update OS Preference": { diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index a89ba96452c..64f84d20f1c 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -1229,12 +1229,12 @@ var directNetworkActionMap = { inProcessText: "Deleting Network....", afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp("slow", function() { - $(this).remove(); - }); - if(id.toString() == $("#right_panel_content").find("#direct_network_page").find("#tab_content_details").find("#id").text()) { - clearRightPanel(); - directNetworkClearRightPanel(); - } + $(this).remove(); + if(id.toString() == $("#right_panel_content").find("#direct_network_page").find("#tab_content_details").find("#id").text()) { + clearRightPanel(); + directNetworkClearRightPanel(); + } + }); } } } diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js index 419438c89dd..213c10f5add 100644 --- a/ui/scripts/cloud.core.pod.js +++ b/ui/scripts/cloud.core.pod.js @@ -878,12 +878,12 @@ var podActionMap = { inProcessText: "Deleting Pod....", afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp("slow", function() { - $(this).remove(); + $(this).remove(); + if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { + clearRightPanel(); + podJsonClearRightPanel(); + } }); - if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { - clearRightPanel(); - podJsonClearRightPanel(); - } } } } diff --git a/ui/scripts/cloud.core.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js index f82efc9088a..28496d38469 100644 --- a/ui/scripts/cloud.core.primarystorage.js +++ b/ui/scripts/cloud.core.primarystorage.js @@ -223,12 +223,12 @@ var primarystorageActionMap = { inProcessText: "Deleting Primary Storage....", afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp("slow", function() { - $(this).remove(); - }); - if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { - clearRightPanel(); - primarystorageClearRightPanel(); - } + $(this).remove(); + if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { + clearRightPanel(); + primarystorageClearRightPanel(); + } + }); } } } diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js index c7305c579a3..61eff435646 100644 --- a/ui/scripts/cloud.core.zone.js +++ b/ui/scripts/cloud.core.zone.js @@ -911,16 +911,15 @@ var zoneActionMap = { inProcessText: "Deleting Zone....", afterActionSeccessFn: function(json, $leftmenuItem1, id) { $leftmenuItem1.slideUp(function() { - $(this).remove(); + $(this).remove(); + if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { + clearRightPanel(); + zoneJsonClearRightPanel(); + } }); - if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { - clearRightPanel(); - zoneJsonClearRightPanel(); - } } } } - function doEditZone($actionLink, $detailsTab, $leftmenuItem1) { var $readonlyFields = $detailsTab.find("#name, #dns1, #dns2, #internaldns1, #internaldns2, #vlan, #guestcidraddress");