From 3d5240b70d39b398018c0c04c420fc86da65d41a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 11 Apr 2012 16:03:16 +0000
Subject: - Revert r6060, fix #1487822 using css-only

---
 CHANGELOG                             | 2 +-
 program/include/rcube_json_output.php | 2 +-
 program/steps/mail/list.inc           | 8 +-------
 skins/default/mail.css                | 1 +
 skins/larry/mail.css                  | 1 +
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fa01e5fb1..a074cab36 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Set flexible width to login form fields (#1488418)
-- Force page reload if list columns changed in IE8 (#1487822)
+- Fix re-draw bug on list columns change in IE8 (#1487822)
 - Allow mass-removal of addresses from a group (#1487748)
 - Fix removing all contacts on import to LDAP addressbook
 - Fix so "Back" from compose/show doesn't reset search request (#1488238)
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index f062d4b71..99f08f5c9 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -212,7 +212,7 @@ class rcube_json_output
     public function redirect($p = array(), $delay = 1)
     {
         $location = rcmail::get_instance()->url($p);
-        $this->remote_response(sprintf("window.setTimeout(function(){ %s.redirect('%s',true); }, %d);", JS_OBJECT_NAME, $location, $delay));
+        $this->remote_response("window.setTimeout(\"location.href='{$location}'\", $delay);");
         exit;
     }
 
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 930758354..dad86663a 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -51,15 +51,9 @@ if ($cols = get_input_value('_cols', RCUBE_INPUT_GET))
   $save_arr['list_cols'] = explode(',', $cols);
 }
 
-if ($save_arr) {
+if ($save_arr)
   $RCMAIL->user->save_prefs($save_arr);
 
-  // force page reload if list columns changed in IE8 (#1487822)
-  if ($save_arr['list_cols'] && $OUTPUT->browser->ie && $OUTPUT->browser->ver == 8) {
-    $OUTPUT->redirect(array('_mbox' => $RCMAIL->storage->get_folder()), 0);
-  }
-}
-
 $mbox_name = $RCMAIL->storage->get_folder();
 $threading = (bool) $RCMAIL->storage->get_threading();
 
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 1cd1fe5d5..2661afdf5 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -681,6 +681,7 @@ body.messagelist
 #messagelist thead tr td.subject
 {
   padding-left: 18px;
+  width: 99%;
 }
 
 #messagelist tbody tr td
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 857389576..a4af1b8c2 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -579,6 +579,7 @@ a.iconbutton.threadmode.selected {
 	width: 26px;
 }
 
+#messagelist thead tr td.subject,
 #messagelist tbody tr td.subject {
 	width: 99%;
 	white-space: nowrap;
-- 
cgit v1.2.3