From c272db84bd1f77eef36b980f5333d8c15f48c8d1 Mon Sep 17 00:00:00 2001 From: jessica Date: Fri, 27 Aug 2010 11:25:50 -0700 Subject: [PATCH] apply new class for items in action --- ui/new/scripts/cloud.core.init.js | 2 +- ui/new/scripts/cloud.core.instance.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/new/scripts/cloud.core.init.js b/ui/new/scripts/cloud.core.init.js index f44d96595f8..902a7acfe79 100755 --- a/ui/new/scripts/cloud.core.init.js +++ b/ui/new/scripts/cloud.core.init.js @@ -18,7 +18,7 @@ $(document).ready(function() { selecting: function(event, ui) { if(ui.selecting.id.indexOf("midmenuItem") != -1) { var $t = $("#"+ui.selecting.id); - if($t.find("#content").hasClass("adding") == false) { //only items not in action are allowed to be selected + if($t.find("#content").hasClass("inaction") == false) { //only items not in action are allowed to be selected var id =$t.data("id"); selectedItemIds[id] = null; $t.find("#content").addClass("selected"); diff --git a/ui/new/scripts/cloud.core.instance.js b/ui/new/scripts/cloud.core.instance.js index 2b4989dbfaf..e3262e1ce11 100755 --- a/ui/new/scripts/cloud.core.instance.js +++ b/ui/new/scripts/cloud.core.instance.js @@ -209,7 +209,7 @@ function clickInstanceGroupHeader($arrowIcon) { var jobIdMap = {}; for(var id in selectedItemIds) { var $midmenuItem = $("#midmenuItemVm_"+id); - $midmenuItem.find("#content").removeClass("selected").addClass("adding"); + $midmenuItem.find("#content").removeClass("selected").addClass("inaction"); $midmenuItem.find("#spinning_wheel").addClass("midmenu_addingloader").show(); $midmenuItem.find("#info_icon").hide(); //Async job (begin) ***** @@ -237,7 +237,7 @@ function clickInstanceGroupHeader($arrowIcon) { $("body").stopTime(timerKey); var itemId = jobIdMap[jobId]; $item = $("#midmenuItemVm_"+itemId); - $item.find("#content").removeClass("adding"); + $item.find("#content").removeClass("inaction"); $item.find("#spinning_wheel").hide(); if (result.jobstatus == 1) { // Succeeded $item.find("#info_icon").removeClass("error").show(); @@ -276,7 +276,7 @@ function clickInstanceGroupHeader($arrowIcon) { dataType: "json", async: false, success: function(json) { - $midmenuItem.find("#content").removeClass("adding"); + $midmenuItem.find("#content").removeClass("inaction"); $midmenuItem.find("#spinning_wheel").hide(); //RecoverVirtualMachine API doesn't return an embedded object on success (Bug 6037) @@ -851,7 +851,7 @@ function clickInstanceGroupHeader($arrowIcon) { var $t = $("#midmenu_item_vm").clone(); $t.find("#vm_name").text("Adding...."); $t.find("#ip_address_container #label").hide(); - $t.find("#content").addClass("adding"); + $t.find("#content").addClass("inaction"); $t.find("#spinning_wheel").show(); $("#midmenu_container").append($t.show()); @@ -877,7 +877,7 @@ function clickInstanceGroupHeader($arrowIcon) { return; //Job has not completed } else { $("body").stopTime(timerKey); - $t.find("#content").removeClass("adding"); + $t.find("#content").removeClass("inaction"); $t.find("#spinning_wheel").hide(); if (result.jobstatus == 1) { // Succeeded