From f46fde8b160021f4dbadba7befcce25683006038 Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 23 Feb 2005 17:19:36 +0000
Subject: [PATCH] minor work on search fields

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@611 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/MailerUI/searchfield.js                | 7 +++++--
 SOGo/UI/Templates/MailerUI/UIxMailListView.wox | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/SOGo/UI/MailerUI/searchfield.js b/SOGo/UI/MailerUI/searchfield.js
index 22f9dc6f..c01af591 100644
--- a/SOGo/UI/MailerUI/searchfield.js
+++ b/SOGo/UI/MailerUI/searchfield.js
@@ -37,8 +37,11 @@ function ml_reloadTableView(searchtext, elementid) {
     // TODO: properly parse query parameters    
     viewURL      = this.location.href;
     hasQueryPara = viewURL.indexOf("?") == -1 ? false : true;
-    url = viewURL + "?noframe=1&search=" + searchtext;
+    url = (hasQueryPara ? "&" : "?") + "noframe=1&search=";
+    url = url + encodeURIComponent(searchtext);
+    // alert("GET " + url);
     
+    url = viewURL + url;
     http.open("GET", url, false);
     http.send(null);
     if (http.status != 200) {
@@ -55,7 +58,7 @@ function ml_reloadTableView(searchtext, elementid) {
 
 function ml_reloadSearchIfFieldChanged() {
   if (field) {
-    if (field.value != firstValue) {
+    if (field.value && field.value != firstValue) {
       ml_reloadTableView(field.value, "cl_tableview_reloadroot");
       firstValue = field.value;
     }
diff --git a/SOGo/UI/Templates/MailerUI/UIxMailListView.wox b/SOGo/UI/Templates/MailerUI/UIxMailListView.wox
index af5a2d81..78de1150 100644
--- a/SOGo/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/SOGo/UI/Templates/MailerUI/UIxMailListView.wox
@@ -193,7 +193,7 @@
 
   <var:if condition="hideFrame" const:negate="YES">
     <script language="JavaScript">
-      document.pageform.searchtext.focus();
+      document.pageform.search.focus();
     </script>
   </var:if>
 </var:component>
-- 
2.39.5