From f4698cbfa1b6c7d3c1b5b88555f85c949c3adbef Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 27 Apr 2012 03:13:19 -0400
Subject: [PATCH] - Applied fixes from trunk up to r6129
---
program/js/app.js | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index d7bdfbf..4fa8eff 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -224,7 +224,7 @@
this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
- 'print', 'load-attachment', 'load-headers', 'forward-attachment'];
+ 'print', 'load-attachment', 'show-headers', 'hide-headers', 'forward-attachment'];
if (this.env.action == 'show' || this.env.action == 'preview') {
this.enable_command(this.env.message_commands, this.env.uid);
@@ -577,10 +577,6 @@
}
else if (this.task == 'addressbook')
this.list_contacts(props);
- break;
-
- case 'load-headers':
- this.load_headers(obj);
break;
case 'sort':
@@ -1108,7 +1104,7 @@
default:
var func = command.replace(/-/g, '_');
if (this[func] && typeof this[func] === 'function') {
- ret = this[func](props);
+ ret = this[func](props, obj);
}
break;
}
@@ -1856,8 +1852,11 @@
else if (c == 'threads')
html = expando;
else if (c == 'subject') {
- if (bw.ie)
+ if (bw.ie) {
col.onmouseover = function() { rcube_webmail.long_subject_title_ie(this, message.depth+1); };
+ if (bw.ie8)
+ tree = '<span></span>' + tree; // #1487821
+ }
html = tree + cols[c];
}
else if (c == 'priority') {
@@ -5829,14 +5828,14 @@
};
// display all-headers row and fetch raw message headers
- this.load_headers = function(elem)
+ this.show_headers = function(props, elem)
{
if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box || !this.env.uid)
return;
$(elem).removeClass('show-headers').addClass('hide-headers');
$(this.gui_objects.all_headers_row).show();
- elem.onclick = function() { rcmail.hide_headers(elem); };
+ elem.onclick = function() { rcmail.command('hide-headers', '', elem); };
// fetch headers only once
if (!this.gui_objects.all_headers_box.innerHTML) {
@@ -5846,14 +5845,14 @@
};
// hide all-headers row
- this.hide_headers = function(elem)
+ this.hide_headers = function(props, elem)
{
if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box)
return;
$(elem).removeClass('hide-headers').addClass('show-headers');
$(this.gui_objects.all_headers_row).hide();
- elem.onclick = function() { rcmail.load_headers(elem); };
+ elem.onclick = function() { rcmail.command('show-headers', '', elem); };
};
--
Gitblit v1.9.1