Fix search when accessing users folders
This commit is contained in:
parent
7c7989065c
commit
128368f66c
|
@ -1,4 +1,4 @@
|
||||||
DIV#filterPanel
|
DIV.filterPanel
|
||||||
{ position: absolute;
|
{ position: absolute;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: auto;
|
width: auto;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
var d;
|
var d;
|
||||||
|
|
||||||
function onSearchFormSubmit() {
|
function onSearchFormSubmit(filterPanel) {
|
||||||
var searchValue = $("searchValue");
|
var searchValue = filterPanel.down('[name="search"]');
|
||||||
var encodedValue = encodeURI(searchValue.value);
|
var encodedValue = encodeURI(searchValue.value);
|
||||||
|
|
||||||
if (encodedValue.blank()) {
|
if (encodedValue.blank()) {
|
||||||
|
@ -15,7 +15,7 @@ function onSearchFormSubmit() {
|
||||||
document.userFoldersRequest.abort();
|
document.userFoldersRequest.abort();
|
||||||
}
|
}
|
||||||
if (encodedValue.trim().length > minimumSearchLength) {
|
if (encodedValue.trim().length > minimumSearchLength) {
|
||||||
startAnimation($("pageContent"), $("filterPanel"));
|
startAnimation($("pageContent"), filterPanel);
|
||||||
document.userFoldersRequest
|
document.userFoldersRequest
|
||||||
= triggerAjaxRequest(url, usersSearchCallback);
|
= triggerAjaxRequest(url, usersSearchCallback);
|
||||||
}
|
}
|
||||||
|
@ -93,14 +93,14 @@ function buildUsersTree(treeDiv, response) {
|
||||||
for (var i = 0; i < response.length; i++) {
|
for (var i = 0; i < response.length; i++) {
|
||||||
if (!isUserDialog) {
|
if (!isUserDialog) {
|
||||||
var toggle = $("tgd" + (1 + i * 2));
|
var toggle = $("tgd" + (1 + i * 2));
|
||||||
toggle.observe ("click", onUserNodeToggle);
|
toggle.on("click", onUserNodeToggle);
|
||||||
}
|
}
|
||||||
var sd = $("sd" + (1 + i * multiplier));
|
var sd = $("sd" + (1 + i * multiplier));
|
||||||
sd.observe("click", onTreeItemClick);
|
sd.on("click", onTreeItemClick);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$("searchValue").addClassName("notfound");
|
$$('[name="searchValue"]').first().addClassName("notfound");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,14 +160,14 @@ function foldersSearchCallback(http) {
|
||||||
//dd.update(str);
|
//dd.update(str);
|
||||||
for (var i = 1; i < folders.length; i++) {
|
for (var i = 1; i < folders.length; i++) {
|
||||||
var sd = $("sd" + (nodeId + i));
|
var sd = $("sd" + (nodeId + i));
|
||||||
sd.observe("click", onTreeItemClick);
|
sd.on("click", onTreeItemClick);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
dd.innerHTML = '';
|
dd.innerHTML = '';
|
||||||
dd.appendChild(addFolderNotFoundNode (d, nodeId, null));
|
dd.appendChild(addFolderNotFoundNode (d, nodeId, null));
|
||||||
var sd = $("sd" + (nodeId + 1));
|
var sd = $("sd" + (nodeId + 1));
|
||||||
sd.observe("click", onTreeItemClick);
|
sd.on("click", onTreeItemClick);
|
||||||
}
|
}
|
||||||
|
|
||||||
d.aIndent.pop();
|
d.aIndent.pop();
|
||||||
|
@ -241,7 +241,7 @@ function onConfirmFolderSelection(event) {
|
||||||
function onFolderSearchKeyDown(event) {
|
function onFolderSearchKeyDown(event) {
|
||||||
if (event.keyCode == Event.KEY_BACKSPACE
|
if (event.keyCode == Event.KEY_BACKSPACE
|
||||||
|| IsCharacterKey(event.keyCode)) {
|
|| IsCharacterKey(event.keyCode)) {
|
||||||
$("searchValue").removeClassName("notfound");
|
$(this).removeClassName("notfound");
|
||||||
var div = $("folders");
|
var div = $("folders");
|
||||||
if (!div.clean) {
|
if (!div.clean) {
|
||||||
var oldD = $("d"); // the folders tree
|
var oldD = $("d"); // the folders tree
|
||||||
|
@ -256,11 +256,11 @@ function onFolderSearchKeyDown(event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function initUserFoldersWindow() {
|
function initUserFoldersWindow() {
|
||||||
var searchValue = $("searchValue");
|
var searchValue = $$('[name="search"]').first();
|
||||||
searchValue.observe("keydown", onFolderSearchKeyDown);
|
searchValue.on("keydown", onFolderSearchKeyDown);
|
||||||
|
|
||||||
$("addButton").observe("click", onConfirmFolderSelection);
|
$("addButton").on("click", onConfirmFolderSelection);
|
||||||
$("doneButton").observe("click", onCloseButtonClick);
|
$("doneButton").on("click", onCloseButtonClick);
|
||||||
|
|
||||||
searchValue.focus();
|
searchValue.focus();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue