amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 04:15:26 +00:00
Code Issues Projects Releases Wiki Activity

merge of '1480ab87cd945c5b85d9c1f7282d0ab1267f37d0'

Browse Source 
and '79cc22f9c2a49076ea278b33a8c3a3ac249d9b75'

Monotone-Parent: 1480ab87cd945c5b85d9c1f7282d0ab1267f37d0
Monotone-Parent: 79cc22f9c2a49076ea278b33a8c3a3ac249d9b75
Monotone-Revision: 4114bd0be7d5fc4d73b57879b042ffab8c6a8d7f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-29T15:40:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-07-29 15:40:52 +00:00
parent 17ee6224fd 37a4b12fa6
commit d2d010d913
7 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/MailerUI.js
+3 -2
View File
@@ -640,8 +640,9 @@ function messageListCallback(http) {
row.selectElement();
lastClickedRow = row.rowIndex - $(row).up('table').down('thead').getElementsByTagName('tr').length;
var rowPosition = row.rowIndex * row.getHeight();
if (rowPosition > div.getHeight())
div.scrollTop = rowPosition; // scroll to selected message
if (rowPosition < div.scrollTop
|| rowPosition > div.scrollTop + div.getHeight ())
div.scrollTop = rowPosition; // scroll to selected message
}
else
$("messageContent").update();
UI/WebServerResources/SchedulerUI.js
+24 -13
View File
@@ -2082,24 +2082,35 @@ function drawNowLine () {
var d = new Date();
var hours = d.getHours();
var minutes = d.getMinutes();
var test = $$("DIV#daysView DIV.days DIV.day");
// day view
if (test.length == 1)
var targets = $$("DIV#daysView DIV.days DIV.day DIV.events DIV.clickableHourCell");
else
if (currentView == "dayview") {
var today = new Date ();
var m = parseInt(today.getMonth ()) + 1;
var d = today.getDate ();
if (m < 10)
m = "0" + m;
if (d < 10)
d = "0" + d;
var day = today.getFullYear () + "" + m + "" + d;
var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day
+ "] DIV.events DIV.clickableHourCell");
}
else if (currentView == "weekview")
var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.events DIV.clickableHourCell");
var target = targets[hours];
if (targets) {
var target = targets[hours];
if (target) {
var div = $("nowLineDisplay");
if (!div)
div = new Element ("div", {'id': 'nowLineDisplay'});
if (target) {
var div = $("nowLineDisplay");
if (!div)
div = new Element ("div", {'id': 'nowLineDisplay'});
div.style.top = parseInt (((minutes * target.offsetHeight) / 60) - 1) + "px";
target.appendChild (div);
div.style.top = parseInt (((minutes * target.offsetHeight) / 60) - 1) + "px";
target.appendChild (div);
setTimeout ("drawNowLine ();", 60000); // 1 min.
setTimeout ("drawNowLine ();", 60000); // 1 min.
}
}
}
UI/WebServerResources/UIxMailEditor.js
+2 -1
View File
@@ -749,7 +749,8 @@ function onWindowResize(event) {
var height = Math.floor(window.height() - editor.offsetTop);
if (Prototype.Browser.IE) {
editor.style.top = 0;
editor.style.width = '';
editor.style.height = '';
height += 3;
}