From 61c18639fef70e0a893be94d66f4ec267ef06506 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 22 Aug 2006 04:15:36 +0000
Subject: [PATCH] Operator selection bug in search interface (need to keep
 track of selected operator now that onConditionSelected() is called after
 loading in a condition)

---
 .../content/scholar/bindings/scholarsearch.xml     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml b/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml
index 845edac8c1..dd1bb4f185 100644
--- a/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml
+++ b/chrome/chromeFiles/content/scholar/bindings/scholarsearch.xml
@@ -169,6 +169,7 @@
 				]]>
 			</constructor>
 			<field name="selectedCondition"/>
+			<field name="selectedOperator"/>
 			<method name="onConditionSelected">
 				<body>
 					<![CDATA[
@@ -176,10 +177,11 @@
 					if (this.id('conditionsmenu').value==this.selectedCondition){
 						return;
 					}
-					this.selectedCondition = this.id('conditionsmenu').value;
-					
 					var operatorsList = this.id('operatorsmenu');
 					
+					this.selectedCondition = this.id('conditionsmenu').value;
+					this.selectedOperator = operatorsList.value;
+					
 					var condition = Scholar.SearchConditions.get(this.id('conditionsmenu').value);	
 					var operators = condition['operators'];
 					
@@ -187,12 +189,14 @@
 					var selectThis;
 					for(var i = 0, len = operatorsList.firstChild.childNodes.length; i < len; i++)
 					{
-						var hidden = !operators[operatorsList.firstChild.childNodes[i].getAttribute('value')];
+						var val = operatorsList.firstChild.childNodes[i].getAttribute('value');
+						var hidden = !operators[val];
 						operatorsList.firstChild.childNodes[i].setAttribute('hidden', hidden);
-						if(selectThis == null && !hidden)
+						if (!hidden && (selectThis == null || this.selectedOperator == val))
+						{
 							selectThis = i;
+						}
 					}
-					
 					operatorsList.selectedIndex = selectThis;
 					
 					// Generate drop-down menus for certain conditions