From 635d2e48b966d36d99df0416e9bd5e63c48b9018 Mon Sep 17 00:00:00 2001
From: David Norton <david@nortoncrew.com>
Date: Tue, 1 Aug 2006 18:01:48 +0000
Subject: [PATCH] Closes #151, Show "X" in search box to cancel search.  - I
 had to make the textbox taller, but it seems to be working right. Fixed
 problem with note editor in right pane not updating correctly.

---
 .../content/scholar/bindings/noteeditor.xml         |  2 +-
 chrome/chromeFiles/content/scholar/overlay.js       |  1 +
 chrome/chromeFiles/content/scholar/overlay.xul      |  4 +++-
 chrome/chromeFiles/skin/default/scholar/overlay.css | 13 +++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/chrome/chromeFiles/content/scholar/bindings/noteeditor.xml b/chrome/chromeFiles/content/scholar/bindings/noteeditor.xml
index b50696702e..2a0fe8fed5 100644
--- a/chrome/chromeFiles/content/scholar/bindings/noteeditor.xml
+++ b/chrome/chromeFiles/content/scholar/bindings/noteeditor.xml
@@ -28,7 +28,7 @@
 						if(this.note.getSource())
 							this.item = Scholar.Items.get(this.note.getSource());
 						
-						this.id('noteField').setAttribute('value',this.note.getNote());
+						this.id('noteField').value = this.note.getNote();
 						this.id('links').item = this.note;
 					]]>
 				</setter>
diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js
index 47416371ba..82bc07e255 100644
--- a/chrome/chromeFiles/content/scholar/overlay.js
+++ b/chrome/chromeFiles/content/scholar/overlay.js
@@ -255,6 +255,7 @@ var ScholarPane = new function()
 			//document.getElementById('scholar-search-options').getElementsByAttribute('checked','true')[0].label
 			
 			document.getElementById('scholar-search-options').hidden = searchVal == "";
+			document.getElementById('tb-search-cancel').hidden = searchVal == "";
 		}
 		
 	}
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index 77b8d6c5ab..f7592d0159 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -92,7 +92,9 @@
 					<toolbarbutton id="tb-note-add" tooltiptext="New Standalone Note" oncommand="ScholarPane.newNote();"/>
 					<spacer flex="1"/>
 					<label value="&toolbar.search.label;" control="tb-search"/>
-					<textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search"/>
+					<textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_scholar_search'); return false; }">
+						<toolbarbutton id="tb-search-cancel" class="tabs-closebutton" oncommand="this.parentNode.value='';" hidden="true"/>
+					</textbox>
 				</toolbar>
 				<hbox id="scholar-search-options" hidden="true">
 					<hbox>
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index d9dff0cd7d..472b6f570a 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -133,6 +133,19 @@
 #tb-search
 {
 	width: 150px;
+	height: 24px;
+	margin: 0px;
+	margin-bottom: 2px;
+	padding: 0px;
+	vertical-align: middle;
+	font-size: 12px; 
+}
+
+#tb-search-cancel
+{
+	margin: 0px;
+	padding: 0px;
+	cursor: pointer;
 }
 
 #scholar-view-item vbox