From beffe264605fe3feabc77bfc3b15686109b0f10f Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 22 Dec 2010 18:24:51 -0800 Subject: [PATCH] new Advanced Search - skip input field's value if it's watermark when searching. --- ui/scripts/cloud.core.event.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js index 914778ab7e6..575030e9eef 100644 --- a/ui/scripts/cloud.core.event.js +++ b/ui/scripts/cloud.core.event.js @@ -40,18 +40,19 @@ function eventGetSearchParams() { moreCriteria.push("&domainid="+todb(domainId)); } - if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none") { + if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none" + && $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) { var account = $advancedSearchPopup.find("#adv_search_account").val(); if (account!=null && account.length > 0) moreCriteria.push("&account="+todb(account)); } var startdate = $advancedSearchPopup.find("#adv_search_startdate").val(); - if (startdate!=null && startdate.length > 0) + if ($advancedSearchPopup.find("#adv_search_startdate").hasClass("textwatermark") == false && startdate!=null && startdate.length > 0) moreCriteria.push("&startdate="+todb(startdate)); var enddate = $advancedSearchPopup.find("#adv_search_enddate").val(); - if (enddate!=null && enddate.length > 0) + if ($advancedSearchPopup.find("#adv_search_enddate").hasClass("textwatermark") == false && enddate!=null && enddate.length > 0) moreCriteria.push("&enddate="+todb(enddate)); }