From 76e6f99cf0809d2a6dd5264fc6d1198a4138bd7a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 21 Nov 2007 17:37:26 +0000
Subject: [PATCH] Monotone-Parent: c646d0cb24c5b2d251fb7736020445cd76631da3
 Monotone-Revision: ddd5665cdecc3c1a1ce97322dd14c8723477bfa5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-21T17:37:26
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/generic.js | 57 ++++++++++++++++----------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 7bcba4ac1..a7f526f33 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -825,7 +825,7 @@ function setSearchCriteria(event) {
   var searchValue = $("searchValue");
   var searchCriteria = $("searchCriteria");
 
-  searchValue.setAttribute("ghost-phrase", this.innerHTML);
+  searchValue.ghostPhrase = this.innerHTML;
   searchCriteria.value = this.getAttribute('id');
   
   if (this.parentNode.chosenNode)
@@ -835,11 +835,9 @@ function setSearchCriteria(event) {
 }
 
 function checkSearchValue(event) {
-  var form = event.target;
   var searchValue = $("searchValue");
-  var ghostPhrase = searchValue.getAttribute('ghost-phrase');
 
-  if (searchValue.value == ghostPhrase)
+  if (searchValue.value == searchValue.ghostPhrase)
     searchValue.value = "";
 }
 
@@ -875,7 +873,7 @@ function onSearchMouseDown(event) {
 }
 
 function onSearchFocus() {
-  ghostPhrase = this.getAttribute("ghost-phrase");
+  ghostPhrase = this.ghostPhrase;
   if (this.value == ghostPhrase) {
     this.value = "";
     this.setAttribute("modified", "");
@@ -887,14 +885,16 @@ function onSearchFocus() {
 }
 
 function onSearchBlur(event) {
-  var ghostPhrase = this.getAttribute("ghost-phrase");
-
   if (!this.value) {
     this.setAttribute("modified", "");
     this.setStyle({ color: "#aaa" });
-    this.value = ghostPhrase;
-    refreshCurrentFolder();
-  } else if (this.value == ghostPhrase) {
+    this.value = this.ghostPhrase;
+    search["value"] = "";
+    if (searchValue.lastSearch != "") {
+      searchValue.lastSearch = "";
+      refreshCurrentFolder();
+    }
+  } else if (this.value == this.ghostPhrase) {
     this.setAttribute("modified", "");
     this.setStyle({ color: "#aaa" });
   } else {
@@ -913,31 +913,32 @@ function onSearchKeyDown(event) {
 function onSearchFormSubmit(event) {
   var searchValue = $("searchValue");
   var searchCriteria = $("searchCriteria");
-  var ghostPhrase = searchValue.getAttribute('ghost-phrase');
    
-  if (searchValue.value == ghostPhrase) return;
-
-  search["criteria"] = searchCriteria.value;
-  search["value"] = searchValue.value;
-
-  refreshCurrentFolder();
+  if (searchValue.value != searchValue.ghostPhrase
+      && searchValue.value != searchValue.lastSearch) {
+    search["criteria"] = searchCriteria.value;
+    search["value"] = searchValue.value;
+    searchValue.lastSearch = searchValue.value;
+    refreshCurrentFolder();
+  }
 }
 
 function initCriteria() {
   var searchCriteria = $("searchCriteria");
   var searchValue = $("searchValue");
  
-  if (!searchValue) return;
-
-  var searchOptions = $("searchOptions").childNodesWithTag("li");
-  if (searchOptions.length > 0) {
-    var firstChild = searchOptions[0];
-    searchCriteria.value = $(firstChild).getAttribute('id');
-    searchValue.setAttribute('ghost-phrase', firstChild.innerHTML);
-    if (searchValue.value == '') {
-      searchValue.value = firstChild.innerHTML;
-      searchValue.setAttribute("modified", "");
-      searchValue.setStyle({ color: "#aaa" });
+  if (searchValue) {
+    var searchOptions = $("searchOptions").childNodesWithTag("li");
+    if (searchOptions.length > 0) {
+      var firstChild = searchOptions[0];
+      searchCriteria.value = $(firstChild).getAttribute('id');
+      searchValue.ghostPhrase = firstChild.innerHTML;
+      searchValue.lastSearch = "";
+      if (searchValue.value == '') {
+	searchValue.value = firstChild.innerHTML;
+	searchValue.setAttribute("modified", "");
+	searchValue.setStyle({ color: "#aaa" });
+      }
     }
   }
 }