From df5d64bb85cd9c863b99a55032f7e1515aeefa1a Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 20 Jan 2011 17:39:28 -0800
Subject: [PATCH] implement Clear Search function - when clear search button is
 clicked, remove search text and search result and list all items in middle
 menu.

---
 ui/index.jsp                  | 2 +-
 ui/scripts/cloud.core.init.js | 7 +++++++
 ui/scripts/cloud.core.js      | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index dafd8a9af79..c93e7e2e570 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -189,7 +189,7 @@
                                 <li>
                                     <div id="basic_search" class="search_textbg">
                                         <input class="text" type="text" id="search_input" />
-                                        <div id="search_closebutton" class="search_closebutton" style="display: none;">
+                                        <div id="clear_search" class="search_closebutton" style="display: none;">
                                         </div>
                                     </div>
                                 </li>
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 422d07dafc6..a44a671c7d6 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -343,6 +343,13 @@ $(document).ready(function() {
 		return;
 	}
 	
+	//clear search
+	$("#clear_search").unbind("click").bind("click", function(event) {	    
+	    if($selectedSubMenu != null)
+	        $selectedSubMenu.click();
+	    return false;
+	});
+	
 	//basic search	
 	$("#basic_search").find("#search_input").unbind("keypress").bind("keypress", function(event) { 	 
 	    event.stopPropagation();   
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 6803bdfc8ec..bb0fb7c0430 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -990,9 +990,9 @@ function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, json
 	
 	var searchParams = getSearchParamsFn();
 	if(searchParams.length > 0)
-	    $("#search_closebutton").show();
+	    $("#clear_search").show();
 	else
-	    $("#search_closebutton").hide();
+	    $("#clear_search").hide();
 	
     var count = 0;    
     $.ajax({