From 7313803188de1ce5a50e54b2dc5e017bb53bbdc1 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 10 Oct 2010 10:51:32 -0700 Subject: [PATCH] nwe UI - use shared function getMidmenuId() to get element id --- ui/new/scripts/cloud.core2.account.js | 2 +- ui/new/scripts/cloud.core2.alert.js | 2 +- ui/new/scripts/cloud.core2.diskoffering.js | 2 +- ui/new/scripts/cloud.core2.event.js | 2 +- ui/new/scripts/cloud.core2.instance.js | 13 ++----------- ui/new/scripts/cloud.core2.router.js | 2 +- ui/new/scripts/cloud.core2.serviceoffering.js | 2 +- ui/new/scripts/cloud.core2.snapshot.js | 2 +- ui/new/scripts/cloud.core2.volume.js | 2 +- 9 files changed, 10 insertions(+), 19 deletions(-) diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index a741c2f243a..6b856cc13cc 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -9,7 +9,7 @@ function afterLoadAccountJSP() { } function accountToMidmenu(jsonObj, $midmenuItem1) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); var $iconContainer = $midmenuItem1.find("#icon_container").show(); diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js index 737775f7bfb..0b497b3e7f9 100644 --- a/ui/new/scripts/cloud.core2.alert.js +++ b/ui/new/scripts/cloud.core2.alert.js @@ -3,7 +3,7 @@ function afterLoadAlertJSP() { } function alertToMidmenu(jsonObj, $midmenuItem1) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); $midmenuItem1.find("#first_row").text(jsonObj.description.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); diff --git a/ui/new/scripts/cloud.core2.diskoffering.js b/ui/new/scripts/cloud.core2.diskoffering.js index 8e07bd16961..cfcdef2fa91 100644 --- a/ui/new/scripts/cloud.core2.diskoffering.js +++ b/ui/new/scripts/cloud.core2.diskoffering.js @@ -64,7 +64,7 @@ function afterLoadDiskOfferingJSP() { } function diskOfferingToMidmenu(jsonObj, $midmenuItem1) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); //var $iconContainer = $midmenuItem1.find("#icon_container").show(); diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index e856b8bdc59..93403044962 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -3,7 +3,7 @@ function afterLoadEventJSP() { } function eventToMidmenu(jsonObj, $midmenuItem1) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); var $iconContainer = $midmenuItem1.find("#icon_container").show(); diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index ea5aff0bfbb..483c647e9c2 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -1233,23 +1233,14 @@ function doDisableHA($actionLink, selectedItemsInMidMenu) { function vmToMidmenu(jsonObj, $midmenuItem1) { $midmenuItem1.data("jsonObj", jsonObj); - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); var vmName = getVmName(jsonObj.name, jsonObj.displayname); $midmenuItem1.find("#first_row").text(vmName); $midmenuItem1.find("#second_row").text(jsonObj.ipaddress); updateStateInMidMenu(jsonObj, $midmenuItem1); - $midmenuItem1.data("toRightPanelFn", vmToRightPanel); - /* - $midmenuItem1.bind("click", function(event) { - var $t = $(this); - $t.find("#content").addClass("selected"); - var toRightPanelFn = $t.data("toRightPanelFn"); - toRightPanelFn($t); - return false; - }); - */ + $midmenuItem1.data("toRightPanelFn", vmToRightPanel); } function vmToRightPanel($midmenuItem) { diff --git a/ui/new/scripts/cloud.core2.router.js b/ui/new/scripts/cloud.core2.router.js index 0446405d0ca..ddcc5e49c0f 100644 --- a/ui/new/scripts/cloud.core2.router.js +++ b/ui/new/scripts/cloud.core2.router.js @@ -3,7 +3,7 @@ function afterLoadRouterJSP() { } function routerToMidmenu(jsonObj, $midmenuItem1) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); diff --git a/ui/new/scripts/cloud.core2.serviceoffering.js b/ui/new/scripts/cloud.core2.serviceoffering.js index b4e5bf99b20..d767784b3f6 100644 --- a/ui/new/scripts/cloud.core2.serviceoffering.js +++ b/ui/new/scripts/cloud.core2.serviceoffering.js @@ -89,7 +89,7 @@ function afterLoadServiceOfferingJSP() { } function serviceOfferingToMidmenu(jsonObj, $midmenuItem1) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); //var $iconContainer = $midmenuItem1.find("#icon_container").show(); diff --git a/ui/new/scripts/cloud.core2.snapshot.js b/ui/new/scripts/cloud.core2.snapshot.js index 37e7ad68014..d086286b916 100644 --- a/ui/new/scripts/cloud.core2.snapshot.js +++ b/ui/new/scripts/cloud.core2.snapshot.js @@ -30,7 +30,7 @@ function afterLoadSnapshotJSP() { } function snapshotToMidmenu(jsonObj, $midmenuItem1) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); var $iconContainer = $midmenuItem1.find("#icon_container").show(); diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js index ed8832bc68e..32d7039680c 100644 --- a/ui/new/scripts/cloud.core2.volume.js +++ b/ui/new/scripts/cloud.core2.volume.js @@ -377,7 +377,7 @@ function volumeAfterDetailsTabAction(json, id, midmenuItemId) { } function volumeToMidmenu(jsonObj, $midmenuItem1) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.attr("id", getMidmenuId(jsonObj)); $midmenuItem1.data("jsonObj", jsonObj); var $iconContainer = $midmenuItem1.find("#icon_container").show();