From bead9f8828ab75b5c462cd6351c432600cbdeffd Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 5 Feb 2008 20:00:52 +0000 Subject: [PATCH] Monotone-Parent: aee5a83161f17cfc5adfc2cd3caf9d72bb2bbe97 Monotone-Revision: 69cc1831846c1c973825222eaf0faa27fa99c1b9 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2008-02-05T20:00:52 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/ContactsUI.js | 18 +++++++++--------- UI/WebServerResources/HTMLElement.js | 4 ++-- UI/WebServerResources/HTMLTableElement.js | 2 +- UI/WebServerResources/MailerUI.js | 16 ++++++++-------- UI/WebServerResources/SchedulerUI.js | 12 ++++++------ UI/WebServerResources/UIxAttendeesEditor.js | 4 ++++ .../UIxContactsUserFolders.js | 2 +- UI/WebServerResources/UIxMailEditor.js | 2 +- UI/WebServerResources/dtree.js | 2 +- UI/WebServerResources/generic.js | 12 ++++++------ UI/WebServerResources/prototype.js | 2 +- 11 files changed, 40 insertions(+), 36 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 87c12eae9..4ec024786 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -132,7 +132,7 @@ function contactsListCallback(http) { for (var i = 0; i < selected.length; i++) { var row = $(selected[i]); if (row) - row.select(); + row.selectElement(); } } } @@ -166,7 +166,7 @@ function onContactFoldersContextMenu(event) { for (var i = 0; i < selectedNodes.length; i++) $(selectedNodes[i]).deselect(); topNode.menuSelectedEntry = this; - $(this).select(); + $(this).selectElement(); } function onContactContextMenu(event, element) { log ("onContactContextMenu"); @@ -181,7 +181,7 @@ function onContactContextMenu(event, element) { log ("onContactContextMenu"); for (var i = 0; i < selectedNodes.length; i++) $(selectedNodes[i]).deselect(); topNode.menuSelectedEntry = element; - $(element).select(); + $(element).selectElement(); } function onContactContextMenuHide(event) { @@ -194,7 +194,7 @@ function onContactContextMenuHide(event) { if (topNode.menuSelectedRows) { var nodes = topNode.menuSelectedRows; for (var i = 0; i < nodes.length; i++) - $(nodes[i]).select(); + $(nodes[i]).selectElement(); topNode.menuSelectedRows = null; } } @@ -209,7 +209,7 @@ function onContactFoldersContextMenuHide(event) { if (topNode.menuSelectedRows) { var nodes = topNode.menuSelectedRows; for (var i = 0; i < nodes.length; i++) - nodes[i].select(); + nodes[i].selectElement(); topNode.menuSelectedRows = null; } } @@ -222,7 +222,7 @@ function onFolderMenuHide(event) { topNode.menuSelectedEntry = null; } if (topNode.selectedEntry) - topNode.selectedEntry.select(); + topNode.selectedEntry.selectElement(); } function loadContact(idx) { @@ -602,7 +602,7 @@ function onFolderUnsubscribeCB(folderId) { var node = $(folderId); node.parentNode.removeChild(node); var personal = $("/personal"); - personal.select(); + personal.selectElement(); onFolderSelectionChange(); } @@ -619,7 +619,7 @@ function onAddressBookRemove(event) { var abId = folderIdElements[0].substr(1); deletePersonalAddressBook(abId); var personal = $("/personal"); - personal.select(); + personal.selectElement(); onFolderSelectionChange(); } } @@ -723,7 +723,7 @@ function configureContactFolders() { lookupDeniedFolders(); var personalFolder = $("/personal"); - personalFolder.select(); + personalFolder.selectElement(); openContactsFolder("/personal"); } } diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js index 8fdcb00a1..33af5266b 100644 --- a/UI/WebServerResources/HTMLElement.js +++ b/UI/WebServerResources/HTMLElement.js @@ -155,7 +155,7 @@ Element.addMethods({ element.onContextMenu.bindAsEventListener(element)); }, - select: function(element) { + selectElement: function(element) { element = $(element); element.addClassName('_selected'); }, @@ -180,7 +180,7 @@ Element.addMethods({ rows = element.getElementsByTagName('TR'); while (s <= e) { if (rows[s].nodeType == 1) - $(rows[s]).select(); + $(rows[s]).selectElement(); s++; } }, diff --git a/UI/WebServerResources/HTMLTableElement.js b/UI/WebServerResources/HTMLTableElement.js index 449175457..b7275a783 100644 --- a/UI/WebServerResources/HTMLTableElement.js +++ b/UI/WebServerResources/HTMLTableElement.js @@ -31,7 +31,7 @@ Element.addMethods({ for (var i = 0; i < nodes.length; i++) { var node = nodes.item(i); if (node.tagName && node.hasClassName(className)) - node.select(); + node.selectElement(); } } } diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index fb055ebc5..c4b8b4530 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -262,7 +262,7 @@ function deleteSelectedMessagesCallback(http) { if (deleteMessageRequestCount == 0) { if (nextRow) { Mailer.currentMessages[Mailer.currentMailbox] = nextRow.getAttribute("id").substr(4); - nextRow.select(); + nextRow.selectElement(); loadMessage(Mailer.currentMessages[Mailer.currentMailbox]); } } @@ -351,7 +351,7 @@ function onMailboxTreeItemClick(event) { if (topNode.selectedEntry) topNode.selectedEntry.deselect(); - this.select(); + this.selectElement(); topNode.selectedEntry = this; search = {}; @@ -537,7 +537,7 @@ function messageListCallback(http) { if (selected) { var row = $("row_" + selected); if (row) { - row.select(); + row.selectElement(); lastClickedRow = row.rowIndex - $(row).up('table').down('thead').getElementsByTagName('tr').length; var rowPosition = row.rowIndex * row.getHeight(); if ($(row).up('div').getHeight() > rowPosition) @@ -626,7 +626,7 @@ function onMessageContextMenuHide(event) { if (topNode.menuSelectedRows) { var nodes = topNode.menuSelectedRows; for (var i = 0; i < nodes.length; i++) - nodes[i].select(); + nodes[i].selectElement(); topNode.menuSelectedRows = null; } } @@ -659,7 +659,7 @@ function onFolderMenuClick(event) { if (topNode.menuSelectedEntry) topNode.menuSelectedEntry.deselect(); topNode.menuSelectedEntry = this; - this.select(); + this.selectElement(); preventDefault(event); } @@ -672,7 +672,7 @@ function onFolderMenuHide(event) { topNode.menuSelectedEntry = null; } if (topNode.selectedEntry) - topNode.selectedEntry.select(); + topNode.selectedEntry.selectElement(); } function deleteCachedMessage(messageId) { @@ -1244,7 +1244,7 @@ function openInbox(node) { openMailbox(node.parentNode.getAttribute("dataname")); var tree = $("mailboxTree"); tree.selectedEntry = node; - node.select(); + node.selectElement(); mailboxTree.o(1); } @@ -1450,7 +1450,7 @@ function onLoadMailboxesCallback(http) { // var links = document.getElementsByClassName("node", treeNodes[i]); // if (tree.selectedEntry) // tree.selectedEntry.deselect(); - // links[0].select(); + // links[0].selectElement(); // tree.selectedEntry = links[0]; // expandUpperTree(links[0]); // } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index d9ab34890..c459dc400 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -269,7 +269,7 @@ function onDaySelect(node) { if (document.selectedDate) document.selectedDate.deselect(); - td.select(); + td.selectElement(); document.selectedDate = td; changeCalendarDisplay( { "day": day } ); @@ -445,7 +445,7 @@ function tasksListCallback(http) { var selectedNodesId = http.callbackData; for (var i = 0; i < selectedNodesId.length; i++) { // log(selectedNodesId[i] + " (" + i + ") is selected"); - $(selectedNodesId[i]).select(); + $(selectedNodesId[i]).selectElement(); } } else @@ -474,7 +474,7 @@ function restoreCurrentDaySelection(div) { var td = $(elements[i]).getParentWithTagName("td"); if (document.selectedDate) document.selectedDate.deselect(); - $(td).select(); + $(td).selectElement(); document.selectedDate = td; } } @@ -547,7 +547,7 @@ function changeCalendarDisplay(data, newView) { var selectedLink = $$('table#dateSelectorTable a[day='+day+']'); if (selectedLink.length > 0) { selectedCell = selectedLink[0].up(1); - selectedCell.select(); + selectedCell.selectElement(); document.selectedDate = selectedCell; } @@ -1148,7 +1148,7 @@ function selectCalendarEvent(div) { selectedCalendarCell[i].deselect(); for (var i = 0; i < div.siblings.length; i++) - div.siblings[i].select(); + div.siblings[i].selectElement(); selectedCalendarCell = div.siblings; } @@ -1164,7 +1164,7 @@ function onCalendarSelectEvent() { if (row) { var div = row.parentNode.parentNode.parentNode; div.scrollTop = row.offsetTop - (div.offsetHeight / 2); - row.select(); + row.selectElement(); } } diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js index 9484f18b5..655ecfff4 100644 --- a/UI/WebServerResources/UIxAttendeesEditor.js +++ b/UI/WebServerResources/UIxAttendeesEditor.js @@ -49,6 +49,10 @@ function onContactKeydown(event) { delayedSearch = true; setTimeout("performSearch()", attendeesEditor.delay); } + else if (this.value.length == 0) { + if (document.currentPopupMenu) + hideMenu(document.currentPopupMenu); + } } else if (this.confirmedValue) if (event.keyCode == 13) // Enter diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js index 57fc1a342..ee22fd26d 100644 --- a/UI/WebServerResources/UIxContactsUserFolders.js +++ b/UI/WebServerResources/UIxContactsUserFolders.js @@ -86,7 +86,7 @@ function onFolderTreeItemClick(event) { var topNode = $("d"); if (topNode.selectedEntry) topNode.selectedEntry.deselect(); - this.select(); + this.selectElement(); topNode.selectedEntry = this; } diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js index 53d1fd813..e961740bf 100644 --- a/UI/WebServerResources/UIxMailEditor.js +++ b/UI/WebServerResources/UIxMailEditor.js @@ -364,7 +364,7 @@ function onSelectAllAttachments() { var list = $("attachments"); var nodes = list.childNodesWithTag("li"); for (var i = 0; i < nodes.length; i++) - nodes[i].select(); + nodes[i].selectElement(); } function onWindowResize(event) { diff --git a/UI/WebServerResources/dtree.js b/UI/WebServerResources/dtree.js index 4ddee693c..8167ce9ac 100644 --- a/UI/WebServerResources/dtree.js +++ b/UI/WebServerResources/dtree.js @@ -221,7 +221,7 @@ dTree.prototype.s = function(id) { eOld.deselect(); } eNew = document.getElementById("s" + this.obj + id); - eNew.select(); + eNew.selectElement(); this.selectedNode = id; if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id); } diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index d226e99fe..c5ef30a00 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -555,13 +555,13 @@ function onRowClick(event) { else if (isNodeSelected(node) == true) { $(node).deselect(); } else { - $(node).select(); + $(node).selectElement(); } // At this point, should empty content of 3-pane view } else { // Single line selection $(node.parentNode).deselectAll(); - $(node).select(); + $(node).selectElement(); if (initialSelection != $(node.parentNode).getSelectedNodes()) { // Selection has changed; fire mousedown event @@ -920,7 +920,7 @@ function onSearchFocus() { this.value = ""; this.setAttribute("modified", ""); } else { - this.select(); + this.selectElement(); } this.setStyle({ color: "#000" }); @@ -975,9 +975,9 @@ function initCriteria() { var searchCriteria = $("searchCriteria"); var searchValue = $("searchValue"); var searchOptions = $("searchOptions"); - + if (searchValue) { - var firstOption = searchOptions.down('li'); + var firstOption = searchOptions.down("li"); if (firstOption) { searchCriteria.value = firstOption.getAttribute('id'); searchValue.ghostPhrase = firstOption.innerHTML; @@ -1181,7 +1181,7 @@ function initMenus() { } function initMenu(menuDIV, callbacks) { - var lis = $(menuDIV.down("ul")).childNodesWithTag("li"); + var lis = menuDIV.down("ul").childNodesWithTag("li"); for (var j = 0; j < lis.length; j++) { var node = $(lis[j]); node.observe("mousedown", listRowMouseDownHandler, false); diff --git a/UI/WebServerResources/prototype.js b/UI/WebServerResources/prototype.js index 6385503a1..35a691379 100644 --- a/UI/WebServerResources/prototype.js +++ b/UI/WebServerResources/prototype.js @@ -4218,4 +4218,4 @@ Object.extend(Element.ClassNames.prototype, Enumerable); /*--------------------------------------------------------------------------*/ -Element.addMethods(); \ No newline at end of file +Element.addMethods();