From 1b977acaf9850cd0178986bfb43274d566fa4e27 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 20 Jan 2011 18:16:19 -0800
Subject: [PATCH] Refresh button - when refresh button is clicked, populate
 search result again if middle menu is previously populated with search
 result.

---
 ui/scripts/cloud.core.init.js |  4 ++--
 ui/scripts/cloud.core.js      | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index f2de32627ee..8012f47561a 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -358,7 +358,7 @@ $(document).ready(function() {
 	        var params = $("#middle_menu_pagination").data("params");
 	        if(params == null)
 	            return;	 
-	        lastSearchType = "basic_search";       	    
+	        //lastSearchType = "basic_search";       	    
 	        listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
 	    }		    
 	});
@@ -396,7 +396,7 @@ $(document).ready(function() {
 	                    var params = $("#middle_menu_pagination").data("params");
 	                    if(params == null)
 	                        return;	        	    
-	                    lastSearchType = "advanced_search";  	                
+	                    //lastSearchType = "advanced_search";  	                
 	                    listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);    	                            
 	                }	
 	            });	
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 9ce254b0b54..5e4ac8d1f69 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -970,9 +970,12 @@ function getMidmenuId(jsonObj) {
     return "midmenuItem_" + jsonObj.id; 
 }
 
-var lastSearchType;
+//var lastSearchType;
 var currentCommandString;
 function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, page) {                
+	$("#midmenu_container").hide();
+	$("#midmenu_spinning_wheel").show();
+	
 	var params = {
         "commandString": commandString,
         "getSearchParamsFn": getSearchParamsFn,
@@ -1046,12 +1049,14 @@ var currentRightPanelJSP = null;
 function listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSPFn, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, leftmenuId, refreshDataBindingFn) { 
 	clearMiddleMenu();
 	showMiddleMenu();	
-	$("#midmenu_container").hide();
-	$("#midmenu_spinning_wheel").show();
 	
 	currentLeftMenuId = leftmenuId;
 	$("#right_panel").data("onRefreshFn", function() {
-	    $("#"+leftmenuId).click();
+	    //$("#"+leftmenuId).click();	    
+	    var params = $("#middle_menu_pagination").data("params");
+        if(params == null)
+            return;	 	         	    
+        listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);	    
 	});
 
 	if (currentRightPanelJSP != rightPanelJSP) {