merge of '6b660347be61a45d2d8fc0c15b01dd94e0d39c5c'

and 'c5f0b0acb95d3e825108b7746d4ae0598b713d8f'

Monotone-Parent: 6b660347be61a45d2d8fc0c15b01dd94e0d39c5c
Monotone-Parent: c5f0b0acb95d3e825108b7746d4ae0598b713d8f
Monotone-Revision: 46e3af5f0c744f5d732638f9ea71cd2450747aad

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-29T15:22:24
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2007-05-29 15:22:24 +00:00
commit bccb467077
3 changed files with 7 additions and 8 deletions

View file

@ -72,8 +72,7 @@ Element.addMethods({
var i = 0;
while (currentElement
&& currentElement instanceof HTMLElement) {
while (currentElement && currentElement.tagName) {
offset += currentElement.offsetTop;
currentElement = currentElement.parentNode;
i++;

View file

@ -1128,11 +1128,11 @@ function onCalendarRemove(event) {
function configureSearchField() {
var searchValue = $("searchValue");
Event.observe(searchValue, "mousedown", onSearchMouseDown);
Event.observe(searchValue, "click", popupSearchMenu);
Event.observe(searchValue, "blur", onSearchBlur);
Event.observe(searchValue, "focus", onSearchFocus);
Event.observe(searchValue, "keydown", onSearchKeyDown);
Event.observe(searchValue, "mousedown", onSearchMouseDown.bindAsEventListener(searchValue));
Event.observe(searchValue, "click", popupSearchMenu.bindAsEventListener(searchValue));
Event.observe(searchValue, "blur", onSearchBlur.bindAsEventListener(searchValue));
Event.observe(searchValue, "focus", onSearchFocus.bindAsEventListener(searchValue));
Event.observe(searchValue, "keydown", onSearchKeyDown.bindAsEventListener(searchValue));
}
function initCalendars() {

View file

@ -690,7 +690,7 @@ function checkDropDown(event) {
/* search field */
function popupSearchMenu(event) {
var node = event.target;
var node = getTarget(event);
var menuId = this.getAttribute("menuid");
relX = event.pageX - node.cascadeLeftOffset();