LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge of '721baf81426a46990c5c456d170347f03f502d1f'

Browse source 
and 'c4c5e180ad8506d04424626e6382fcd5b2b6a073'

Monotone-Parent: 721baf81426a46990c5c456d170347f03f502d1f
Monotone-Parent: c4c5e180ad8506d04424626e6382fcd5b2b6a073
Monotone-Revision: b68bf00d72134acbc6e4d38e8249c1c370f4da8d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-09-05T02:39:04
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2008-09-05 02:39:04 +00:00
parent 4eac9ac1e3 b6ac93ac8e
commit a34edc3169
6 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
UI/Templates/MailerUI/UIxMailListView.wox
View file

@ -104,10 +104,8 @@
></td
><td class="messageDateColumn"
><span class="mailer_datefield"
><var:string value="messageDate"
/></span
><entity name="nbsp"
><var:string value="messageDate"
/><entity name="nbsp"
/></td
></tr>
</var:foreach>

1
UI/Templates/UIxPageFrame.wox
View file

@ -118,6 +118,7 @@
<script type="text/javascript" rsrc:src="prototype.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="tablekit.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="tablekit-sogo.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="JavascriptAPIExtensions.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="HTMLElement.js"><!-- space --></script>
<script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space --></script>

8
UI/WebServerResources/MailerUI.css
View file

@ -236,11 +236,6 @@ DIV#folderTreeContent TABLE TD
/* mail tableview */
span.mailer_datefield
{
white-space: nowrap;
}
TD.mailer_readmailsubject
{
padding-left: 20px !important;
@ -421,7 +416,8 @@ TD.mailer_fieldvalue a
}
TR.deleted TD
{ text-decoration: line-through; }
{ display: none;
/* text-decoration: line-through; -- alternative display */ }
img.mailer_imagecontent
{

37
UI/WebServerResources/MailerUI.js
View file

@ -238,15 +238,16 @@ function onDocumentKeydown(event) {
function deleteSelectedMessages(sender) {
var messageList = $("messageList");
var rowIds = messageList.getSelectedRowsId();
if (rowIds.length > 0) {
for (var i = 0; i < rowIds.length; i++) {
var rows = messageList.down("TBODY").getSelectedNodes();
if (rows.length > 0) {
for (var i = 0; i < rows.length; i++) {
var url;
var rowId = rowIds[i].substr(4);
var rowId = rows[i].readAttribute("id").substr(4);
var messageId = Mailer.currentMailbox + "/" + rowId;
url = ApplicationBaseURL + messageId + "/trash";
deleteMessageRequestCount++;
rows[i].addClassName("deleted");
var data = { "id": rowId, "mailbox": Mailer.currentMailbox, "messageId": messageId };
triggerAjaxRequest(url, deleteSelectedMessagesCallback, data);
}
@ -268,16 +269,15 @@ function deleteSelectedMessagesCallback(http) {
div.update();
Mailer.currentMessages[Mailer.currentMailbox] = null;
}
var row = $("row_" + data["id"]);
var nextRow = row.next("tr");
if (!nextRow)
nextRow = row.previous("tr");
// row.addClassName("deleted"); // when we'll offer "mark as deleted"
if (deleteMessageRequestCount == 0) {
var row = $("row_" + data["id"]);
var nextRow = row.next("tr");
if (!nextRow)
nextRow = row.previous("tr");
// row.addClassName("deleted"); // when we'll offer "mark as deleted"
if (nextRow) {
Mailer.currentMessages[Mailer.currentMailbox] = nextRow.getAttribute("id").substr(4);
nextRow.selectElement();
loadMessage(Mailer.currentMessages[Mailer.currentMailbox]);
}
refreshCurrentFolder();
@ -563,9 +563,8 @@ function messageListCallback(http) {
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)
rowPosition = 0;
div.scrollTop = rowPosition; // scroll to selected message
if (rowPosition > div.getHeight())
div.scrollTop = rowPosition; // scroll to selected message
}
else
$("messageContent").update();
@ -1236,10 +1235,10 @@ function configureMessageListBodyEvents(table) {
row.observe("selectstart", listRowMouseDownHandler);
row.observe("contextmenu", onMessageContextMenu);
row.dndTypes = function() { return new Array("mailRow"); };
row.dndGhost = messageListGhost;
row.dndDataForType = messageListData;
// document.DNDManager.registerSource(row);
//row.dndTypes = function() { return new Array("mailRow"); };
//row.dndGhost = messageListGhost;
//row.dndDataForType = messageListData;
//document.DNDManager.registerSource(row);
for (var j = 0; j < row.cells.length; j++) {
var cell = $(row.cells[j]);

4
UI/WebServerResources/generic.js
View file

@ -564,11 +564,13 @@ function onRowClick(event) {
if (isMac() && isSafari())
if (event.ctrlKey == 1)
isLeftClick = false; // Control-click is equivalent to right-click under Mac OS X
else if (event.metaKey == 1) // Command-click
isLeftClick = true;
else
isLeftClick = Event.isLeftClick(event);
else
isLeftClick = Event.isLeftClick(event);
if (initialSelection.length > 0
&& initialSelection.indexOf(node) >= 0
&& !isLeftClick)

11
UI/WebServerResources/tablekit-sogo.js Normal file
View file

@ -0,0 +1,11 @@
Object.extend(TableKit, {
getHeaderCells : function(table, cell) {
if(!table) { table = $(cell).up('table'); }
var id = table.id;
if(!TableKit.tables[id].dom.head) {
// If there are tHead parts, use the first part, not the last one.
TableKit.tables[id].dom.head = $A((table.tHead && table.tHead.rows.length > 0) ? table.tHead.rows[0].cells : table.rows[0].cells);
}
return TableKit.tables[id].dom.head;
}
});