Merge to 2.0.3a

maint-2.1.1 SOGo-2.0.3a
Francis Lachapelle 2012-12-07 09:35:03 -05:00
commit 6a70db80e6
2 changed files with 3 additions and 2 deletions

View File

@ -623,7 +623,7 @@ function onMailboxTreeItemClick(event) {
topNode.selectedEntry = this;
search = {};
$("searchValue").value = "";
$$('[name="search"]').first().value = "";
initCriteria();
Mailer.currentMailboxType = this.parentNode.getAttribute("datatype");

View File

@ -1183,7 +1183,8 @@ function onSearchFormSubmit(filterPanel) {
if (searchValue.value != searchValue.ghostPhrase
&& (searchValue.value != searchValue.lastSearch
&& (searchValue.value.strip().length > minimumSearchLength
|| searchValue.value.strip() == "." ))) {
|| searchValue.value.strip() == "."
|| searchValue.value.length == 0))) {
search[id]["criteria"] = searchCriteria.value;
search[id]["value"] = searchValue.value;
searchValue.lastSearch = searchValue.value;