LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix search when accessing users folders

pull/7/head
Francis Lachapelle 2012-12-06 13:03:10 -05:00
parent 7c7989065c
commit 128368f66c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/WebServerResources/UIxContactsUserFolders.css
View File

@ -1,4 +1,4 @@
DIV#filterPanel
DIV.filterPanel
{ position: absolute;
text-align: center;
width: auto;

26
UI/WebServerResources/UIxContactsUserFolders.js
View File

@ -1,7 +1,7 @@
var d;
function onSearchFormSubmit() {
var searchValue = $("searchValue");
function onSearchFormSubmit(filterPanel) {
var searchValue = filterPanel.down('[name="search"]');
var encodedValue = encodeURI(searchValue.value);
if (encodedValue.blank()) {
@ -15,7 +15,7 @@ function onSearchFormSubmit() {
document.userFoldersRequest.abort();
}
if (encodedValue.trim().length > minimumSearchLength) {
startAnimation($("pageContent"), $("filterPanel"));
startAnimation($("pageContent"), filterPanel);
document.userFoldersRequest
= triggerAjaxRequest(url, usersSearchCallback);
}
@ -93,14 +93,14 @@ function buildUsersTree(treeDiv, response) {
for (var i = 0; i < response.length; i++) {
if (!isUserDialog) {
var toggle = $("tgd" + (1 + i * 2));
toggle.observe ("click", onUserNodeToggle);
toggle.on("click", onUserNodeToggle);
}
var sd = $("sd" + (1 + i * multiplier));
sd.observe("click", onTreeItemClick);
sd.on("click", onTreeItemClick);
}
}
else {
$("searchValue").addClassName("notfound");
$$('[name="searchValue"]').first().addClassName("notfound");
}
}
@ -160,14 +160,14 @@ function foldersSearchCallback(http) {
//dd.update(str);
for (var i = 1; i < folders.length; i++) {
var sd = $("sd" + (nodeId + i));
sd.observe("click", onTreeItemClick);
sd.on("click", onTreeItemClick);
}
}
else {
dd.innerHTML = '';
dd.appendChild(addFolderNotFoundNode (d, nodeId, null));
var sd = $("sd" + (nodeId + 1));
sd.observe("click", onTreeItemClick);
sd.on("click", onTreeItemClick);
}
d.aIndent.pop();
@ -241,7 +241,7 @@ function onConfirmFolderSelection(event) {
function onFolderSearchKeyDown(event) {
if (event.keyCode == Event.KEY_BACKSPACE
|| IsCharacterKey(event.keyCode)) {
$("searchValue").removeClassName("notfound");
$(this).removeClassName("notfound");
var div = $("folders");
if (!div.clean) {
var oldD = $("d"); // the folders tree
@ -256,11 +256,11 @@ function onFolderSearchKeyDown(event) {
}
function initUserFoldersWindow() {
var searchValue = $("searchValue");
searchValue.observe("keydown", onFolderSearchKeyDown);
var searchValue = $$('[name="search"]').first();
searchValue.on("keydown", onFolderSearchKeyDown);
$("addButton").observe("click", onConfirmFolderSelection);
$("doneButton").observe("click", onCloseButtonClick);
$("addButton").on("click", onConfirmFolderSelection);
$("doneButton").on("click", onCloseButtonClick);
searchValue.focus();
}