summaryrefslogtreecommitdiff
path: root/program/js/app.js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-11 10:57:24 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-11 14:11:47 +0200
commitaf7264ab2b067f100342e68a25053ae8fb6bb5fa (patch)
tree7989168543dd9af67dd811002623f1cd91b2a878 /program/js/app.js
parent68b9f365b38fe68848eedf81a9eaad7810f51b0b (diff)
Added separate From and To columns apart from smart From/To column (#1486891)
Diffstat (limited to 'program/js/app.js')
-rw-r--r--program/js/app.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/program/js/app.js b/program/js/app.js
index ae9f4e972..b80efea58 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1624,7 +1624,7 @@ function rcube_webmail()
for (i=0; i<cols.length; i++)
if (cols[i].id && cols[i].id.match(/^rcm/)) {
name = cols[i].id.replace(/^rcm/, '');
- this.env.coltypes.push(name == 'to' ? 'from' : name);
+ this.env.coltypes.push(name);
}
if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
@@ -1903,7 +1903,7 @@ function rcube_webmail()
// make sure new columns are added at the end of the list
var i, idx, name, newcols = [], oldcols = this.env.coltypes;
for (i=0; i<oldcols.length; i++) {
- name = oldcols[i] == 'to' ? 'from' : oldcols[i];
+ name = oldcols[i];
idx = $.inArray(name, cols);
if (idx != -1) {
newcols.push(name);
@@ -5646,7 +5646,7 @@ function rcube_webmail()
// for reordering column array (Konqueror workaround)
// and for setting some message list global variables
- this.set_message_coltypes = function(coltypes, repl)
+ this.set_message_coltypes = function(coltypes, repl, smart_col)
{
var list = this.message_list,
thead = list ? list.list.tHead : null,
@@ -5674,7 +5674,7 @@ function rcube_webmail()
for (n=0, len=this.env.coltypes.length; n<len; n++) {
col = this.env.coltypes[n];
- if ((cell = thead.rows[0].cells[n]) && (col=='from' || col=='to')) {
+ if ((cell = thead.rows[0].cells[n]) && (col == 'from' || col == 'to' || col == 'fromto')) {
cell.id = 'rcm'+col;
// if we have links for sorting, it's a bit more complicated...
if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a') {
@@ -5682,7 +5682,7 @@ function rcube_webmail()
cell.onclick = function(){ return rcmail.command('sort', this.__col, this); };
cell.__col = col;
}
- cell.innerHTML = this.get_label(col);
+ cell.innerHTML = this.get_label(col == 'fromto' ? smart_col : col);
}
}
}