merge of '46e3af5f0c744f5d732638f9ea71cd2450747aad'
and 'd2c4e72f9d0f1afa7607853c20209e0b59e6c1d6' Monotone-Parent: 46e3af5f0c744f5d732638f9ea71cd2450747aad Monotone-Parent: d2c4e72f9d0f1afa7607853c20209e0b59e6c1d6 Monotone-Revision: e7c4dbba9509da25ddf92578482021c0d944d8f1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-29T19:57:48 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
c4015cc9ab
|
@ -469,7 +469,7 @@ function scrollDayView(hour) {
|
||||||
rowNumber = 8;
|
rowNumber = 8;
|
||||||
|
|
||||||
var daysView = $("daysView");
|
var daysView = $("daysView");
|
||||||
var hours = daysView.childNodesWithTag("div")[0].childNodesWithTag("div");
|
var hours = $(daysView.childNodesWithTag("div")[0]).childNodesWithTag("div");
|
||||||
if (hours.length > 0)
|
if (hours.length > 0)
|
||||||
daysView.parentNode.scrollTop = hours[rowNumber + 1].offsetTop;
|
daysView.parentNode.scrollTop = hours[rowNumber + 1].offsetTop;
|
||||||
}
|
}
|
||||||
|
@ -484,7 +484,7 @@ function onClickableCellsDblClick(event) {
|
||||||
function calendarDisplayCallback(http) {
|
function calendarDisplayCallback(http) {
|
||||||
var div = $("calendarView");
|
var div = $("calendarView");
|
||||||
|
|
||||||
// log ("calendardisplaycallback: " + div);
|
//log ("calendarDisplayCallback: " + div);
|
||||||
if (http.readyState == 4
|
if (http.readyState == 4
|
||||||
&& http.status == 200) {
|
&& http.status == 200) {
|
||||||
document.dayDisplayAjaxRequest = null;
|
document.dayDisplayAjaxRequest = null;
|
||||||
|
@ -501,28 +501,27 @@ function calendarDisplayCallback(http) {
|
||||||
contentView = $("calendarContent");
|
contentView = $("calendarContent");
|
||||||
else {
|
else {
|
||||||
scrollDayView(hour);
|
scrollDayView(hour);
|
||||||
// log("cbtest1");
|
|
||||||
contentView = $("daysView");
|
contentView = $("daysView");
|
||||||
}
|
}
|
||||||
var appointments = document.getElementsByClassName("appointment", contentView);
|
var appointments = document.getElementsByClassName("appointment", contentView);
|
||||||
for (var i = 0; i < appointments.length; i++) {
|
for (var i = 0; i < appointments.length; i++) {
|
||||||
Event.observe(appointments[i], "mousedown", listRowMouseDownHandler);
|
Event.observe(appointments[i], "mousedown", listRowMouseDownHandler);
|
||||||
Event.observe(appointments[i], "click", onCalendarSelectAppointment);
|
Event.observe(appointments[i], "click", onCalendarSelectAppointment.bindAsEventListener(appointments[i]));
|
||||||
Event.observe(appointments[i], "dblclick", displayAppointment);
|
Event.observe(appointments[i], "dblclick", displayAppointment.bindAsEventListener(appointments[i]));
|
||||||
}
|
}
|
||||||
var days = document.getElementsByClassName("day", contentView);
|
var days = document.getElementsByClassName("day", contentView);
|
||||||
if (currentView == "monthview")
|
if (currentView == "monthview")
|
||||||
for (var i = 0; i < days.length; i++) {
|
for (var i = 0; i < days.length; i++) {
|
||||||
Event.observe(days[i], "click", onCalendarSelectDay);
|
Event.observe(days[i], "click", onCalendarSelectDay.bindAsEventListener(days[i]));
|
||||||
Event.observe(days[i], "dblclick", onClickableCellsDblClick);
|
Event.observe(days[i], "dblclick", onClickableCellsDblClick.bindAsEventListener(days[i]));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
for (var i = 0; i < days.length; i++) {
|
for (var i = 0; i < days.length; i++) {
|
||||||
Event.observe(days[i], "click", onCalendarSelectDay);
|
Event.observe(days[i], "click", onCalendarSelectDay.bindAsEventListener(days[i]));
|
||||||
var clickableCells = document.getElementsByClassName("clickableHourCell",
|
var clickableCells = document.getElementsByClassName("clickableHourCell",
|
||||||
days[i]);
|
days[i]);
|
||||||
for (var j = 0; j < clickableCells.length; j++)
|
for (var j = 0; j < clickableCells.length; j++)
|
||||||
Event.observe(clickableCells[j], "dblclick", onClickableCellsDblClick);
|
Event.observe(clickableCells[j], "dblclick", onClickableCellsDblClick.bindAsEventListener(clickableCells[j]));
|
||||||
}
|
}
|
||||||
// log("cbtest1");
|
// log("cbtest1");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue