From 51fcb01f0a86d148b470571c7e32dd089c9b090b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 11 Aug 2012 10:57:24 +0200
Subject: Added separate From and To columns apart from smart From/To column
 (#1486891)

Conflicts:

	CHANGELOG
	program/steps/mail/check_recent.inc
	program/steps/mail/func.inc
	program/steps/mail/list.inc
	program/steps/mail/mark.inc
	program/steps/mail/move_del.inc
	program/steps/mail/pagenav.inc
	program/steps/mail/search.inc
	skins/larry/mail.css
	skins/larry/templates/mail.html
	skins/larry/ui.js
---
 program/js/app.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'program/js')

diff --git a/program/js/app.js b/program/js/app.js
index 0db174625..8ec209539 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1600,7 +1600,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)
@@ -1875,7 +1875,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);
@@ -5484,7 +5484,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,
@@ -5512,7 +5512,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') {
@@ -5520,7 +5520,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);
         }
       }
     }
-- 
cgit v1.2.3