amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-10 10:55:08 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: fd131f17ab49c14614952e0ede565d75240108d4

Browse Source 
Monotone-Revision: 2f0d42cca69230479f5caefd8f858f7923b64337

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-28T21:44:49
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-08-28 21:44:49 +00:00
parent 5823cdfa4c
commit c34dcbd1b3
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2008-08-28 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailActions.m ([UIxMailActions
-markMessageUnreadAction]): unselect the mailbox after the operation.
([UIxMailActions -markMessageReadAction]): same as above.
* UI/MailPartViewers/UIxMailPartICalViewer.m
([UIxMailPartICalViewer -hasCalendarAccess]): new method that
returns whether the current user has access to the calendar
UI/MailerUI/UIxMailActions.m
+13 -3
View File
@@ -145,21 +145,31 @@
- (id) markMessageUnreadAction
{
id response;
SOGoMailFolder *mailFolder;
response = [[self clientObject] removeFlags: @"seen"];
if (!response)
response = [self responseWith204];
{
mailFolder = [[self clientObject] container];
[mailFolder unselect];
response = [self responseWith204];
}
return response;
}
- (id) markMessageReadAction
{
id response;
SOGoMailFolder *mailFolder;
response = [[self clientObject] addFlags: @"seen"];
if (!response)
response = [self responseWith204];
{
mailFolder = [[self clientObject] container];
[mailFolder unselect];
response = [self responseWith204];
}
return response;
}
UI/WebServerResources/MailerUI.js
+11 -17
View File
@@ -43,12 +43,7 @@ function openMessageWindow(msguid, url) {
var wId = '';
if (msguid) {
wId += "SOGo_msg" + msguid;
// var url = ApplicationBaseURL + msguid + "/markMessageRead";
// var parts = msguid.split("/");
// var data = { "window": window, "msguid": parts[parts.length-1], "markread": true };
// triggerAjaxRequest(url, mailListMarkMessageCallback, data);
// markMailInWindow(window, msguid, true);
markMailReadInWindow(window, msguid);
}
var msgWin = openMailComposeWindow(url, wId);
msgWin.messageUID = msguid;
@@ -134,13 +129,17 @@ function markMailInWindow(win, msguid, markread) {
img.setAttribute("title", title);
}
}
return true;
}
else
return false;
}
function markMailReadInWindow(win, msguid) {
/* this is called by UIxMailView with window.opener */
return markMailInWindow(win, msguid, true);
}
/* mail list reply */
function openMessageWindowsForSelection(action, firstOnly) {
@@ -171,7 +170,6 @@ function openMessageWindowsForSelection(action, firstOnly) {
}
function mailListMarkMessage(event) {
log("maillistmarkmessage...");
var msguid = this.id.split('_')[1];
var action;
var markread;
@@ -756,7 +754,6 @@ function onMessageSelectionChange() {
}
function loadMessage(idx) {
log("loadMessage: " + idx);
if (document.messageAjaxRequest) {
document.messageAjaxRequest.aborted = true;
document.messageAjaxRequest.abort();
@@ -764,6 +761,7 @@ function loadMessage(idx) {
var cachedMessage = getCachedMessage(idx);
markMailInWindow(window, idx, true);
if (cachedMessage == null) {
var url = (ApplicationBaseURL + Mailer.currentMailbox + "/"
+ idx + "/view?noframe=1");
@@ -943,10 +941,6 @@ function messageCallback(http) {
cachedMessage['text'] = http.responseText;
if (cachedMessage['text'].length < 30000)
storeCachedMessage(cachedMessage);
var url = ApplicationBaseURL + Mailer.currentMailbox + "/" + http.callbackData + "/markMessageRead";
var data = { "window": window, "msguid": http.callbackData, "markread": true };
triggerAjaxRequest(url, mailListMarkMessageCallback, data);
}
}
else
@@ -1225,20 +1219,20 @@ function configureMessageListBodyEvents(table) {
row.observe("mousedown", onRowClick);
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);
for (var j = 0; j < row.cells.length; j++) {
var cell = $(row.cells[j]);
cell.observe("mousedown", listRowMouseDownHandler);
if (j == 2 || j == 3 || j == 5)
cell.observe("dblclick", onMessageDoubleClick);
cell.observe("dblclick", onMessageDoubleClick.bindAsEventListener(cell));
else if (j == 4) {
var img = $(cell.childNodesWithTag("img")[0]);
img.observe("click", mailListMarkMessage);
img.observe("click", mailListMarkMessage.bindAsEventListener(img));
}
}
}