From 1b6727bda6a9fb42ef81fc7f360da4a99f3530f3 Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Mon, 9 Jul 2012 17:54:22 +0000 Subject: [PATCH] revert last commit. The fix is in generic.js, not UIxContactsUserFolders.js Monotone-Parent: 0d5958f50cf116f607e45fcde7496a5bc3726e1c Monotone-Revision: 3896b9b187dfad2b01d68527f0411bd1a7cfe7b4 Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-07-09T17:54:22 --- ChangeLog | 2 +- UI/WebServerResources/UIxContactsUserFolders.js | 3 +-- UI/WebServerResources/generic.js | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 039f98e3e..49c0ccfde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ 2012-07-09 Jean Raby - * UI/WebServerResources/UIxContactsUserFolders.js (onSearchFormSubmit): + * UI/WebServerResources/generic.js (onSearchFormSubmit): Restore behavior of a single dot (.) in the search field (wildcard search) * UI/WebServerResources/SchedulerUI.js (onMenuRawEvent, onMenuRawTask): diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js index 78517a638..06a4e99d2 100644 --- a/UI/WebServerResources/UIxContactsUserFolders.js +++ b/UI/WebServerResources/UIxContactsUserFolders.js @@ -14,8 +14,7 @@ function onSearchFormSubmit() { document.userFoldersRequest.aborted = true; document.userFoldersRequest.abort(); } - if (encodedValue.trim().length > minimumSearchLength - || encodedValue == "." ) { + if (encodedValue.trim().length > minimumSearchLength) { startAnimation($("pageContent"), $("filterPanel")); document.userFoldersRequest = triggerAjaxRequest(url, usersSearchCallback); diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 7653e03fa..2d04513a0 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1179,7 +1179,8 @@ function onSearchFormSubmit(event) { if (searchValue.value != searchValue.ghostPhrase && (searchValue.value != searchValue.lastSearch - && searchValue.value.strip().length > minimumSearchLength)) { + && (searchValue.value.strip().length > minimumSearchLength + || searchValue.value.strip() == "." ))) { search["criteria"] = searchCriteria.value; search["value"] = searchValue.value; searchValue.lastSearch = searchValue.value;