Changeset 3364 in subversion

Timestamp:

Mar 17, 2010 6:40:55 AM (3 years ago)

Author:

thomasb

Message:

Fix thead replacement in IE (unknown errors)

Location:

branches/devel-threads/program

Files:

• js/app.js (modified) (2 diffs)
• steps/mail/func.inc (modified) (3 diffs)

branches/devel-threads/program/js/app.js

@@ -4195 +4195 @@
     
     // set correct list titles
-    var cell, col, found, n;
     var thead = this.gui_objects.messagelist ? this.gui_objects.messagelist.tHead : null;
 
     // replace old column headers
     if (thead && repl) {
-      // throws an 'unknown runtime error' on IE (WTF?)
-      try { this.gui_objects.messagelist.tHead.innerHTML = repl; }
-      catch(e) { }
-    }
-
+      for (var cell, c=0; c < repl.length; c++) {
+        cell = thead.rows[0].cells[c];
+        if (!cell) {
+          cell = document.createElement('td');
+          thead.rows[0].appendChild(cell);
+        }
+        cell.innerHTML = repl[c].html;
+        if (repl[c].id) cell.id = repl[c].id;
+        if (repl[c].className) cell.className = repl[c].className;
+      }
+    }
+
+    var cell, col, n;
     for (n=0; thead && n<this.env.coltypes.length; n++)
       {
@@ -4231 +4238 @@
     this.env.flagged_col = null;
 
+    var found;
     if((found = find_in_array('subject', this.env.coltypes)) >= 0) {
       this.set_env('subject_col', found);

branches/devel-threads/program/steps/mail/func.inc

@@ -203 +203 @@
   $OUTPUT->include_script('list.js');
   
+  $thead = '';
+  foreach (rcmail_message_list_head($attrib, $a_show_cols) as $cell)
+    $thead .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
+  
   return html::tag('table',
     $attrib,
-    html::tag('thead', null, rcmail_message_list_head($attrib, $a_show_cols)) .
+    html::tag('thead', null, html::tag('tr', null, $thead)) .
       html::tag('tbody', null, ''),
     array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
@@ -344 +348 @@
     $list_menu = '';
 
-  $out = html::tag('td', array('class' => 'threads'), $list_menu);
+  $cells = array(array('className' => 'threads', 'html' => $list_menu));
 
   foreach ($a_show_cols as $col) {
@@ -367 +371 @@
 
     // put it all together
-    $out .= html::tag('td', array('class' => $class_name, 'id' => "rcm$col"), $col_name);
-  }
-
-  return html::tag('tr', null, $out);
+    $cells[] = array('className' => $class_name, 'id' => "rcm$col", 'html' => $col_name);
+  }
+
+  return $cells;
 }