From 38aa405ba4a389b69c95f42b80e36a2aa44d20b1 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 22 Dec 2010 18:34:02 -0800
Subject: [PATCH] new advanced search - check advanced search is shown/hidden,
 then search with/without input fields in advanced search.

---
 ui/scripts/cloud.core.event.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js
index 575030e9eef..d8c3dddcd3b 100644
--- a/ui/scripts/cloud.core.event.js
+++ b/ui/scripts/cloud.core.event.js
@@ -24,8 +24,8 @@ function eventGetSearchParams() {
         moreCriteria.push("&keyword="+todb(searchInput));	       
     }     
 
-	var $advancedSearchPopup = $("#advanced_search_popup");
-	if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {		    
+	var $advancedSearchPopup = $("#advanced_search_container").find("#advanced_search_popup");
+	if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {		    
 	    var type = $advancedSearchPopup.find("#adv_search_type").val();							
 		if (type!=null && trim(type).length > 0) 
 			moreCriteria.push("&type="+todb(type));