- Fix marking messages as unread on all pages (#1486592)

release-0.6
alecpl 15 years ago
parent 94a6c642cf
commit f3d37fbbc5

@ -2312,9 +2312,9 @@ function rcube_webmail()
// set a specific flag to one or more messages // set a specific flag to one or more messages
this.mark_message = function(flag, uid) this.mark_message = function(flag, uid)
{ {
var a_uids = new Array(); var a_uids = new Array(),
var r_uids = new Array(); r_uids = new Array(),
var selection = this.message_list ? this.message_list.get_selection() : new Array(); selection = this.message_list ? this.message_list.get_selection() : new Array();
if (uid) if (uid)
a_uids[0] = uid; a_uids[0] = uid;
@ -2346,7 +2346,7 @@ function rcube_webmail()
} }
// nothing to do // nothing to do
if (!r_uids.length) if (!r_uids.length && !this.select_all_mode)
return; return;
switch (flag) switch (flag)
@ -2405,17 +2405,14 @@ function rcube_webmail()
} }
var all_deleted = true; var all_deleted = true;
for (var i=0; i<a_uids.length; i++) for (var uid, i=0; i<a_uids.length; i++)
{ {
uid = a_uids[i]; uid = a_uids[i];
if (rows[uid]) { if (rows[uid] && !rows[uid].deleted) {
if (!rows[uid].deleted)
{
all_deleted = false; all_deleted = false;
break; break;
} }
} }
}
if (all_deleted) if (all_deleted)
this.flag_as_undeleted(a_uids); this.flag_as_undeleted(a_uids);

Loading…
Cancel
Save