Changeset 3118 in subversion

Timestamp:

Nov 19, 2009 1:08:37 PM (4 years ago)

Author:

alec

Message:

• use underlined subject for parent with unread children + some fixes

Location:

branches/devel-threads

Files:

• THREADS (modified) (4 diffs)
• program/include/rcube_imap.php (modified) (1 diff)
• program/js/app.js (modified) (11 diffs)
• program/steps/mail/func.inc (modified) (1 diff)
• skins/default/mail.css (modified) (2 diffs)
• skins/default/templates/mail.html (modified) (1 diff)

branches/devel-threads/THREADS

@@ -9 +9 @@
     - removed imap_thread_algorithm option, we're using the best algorithm
       supported by server and implement REFS sorting in Roundcube
+    - use underlined subject for root with unread children (icon is also supported)
 
 CHANGES IN RELATION TO TRUNK (for pasting into CHANGELOG after merge)
@@ -22 +23 @@
       if "expand all" is disabled we should fetch only root messages and fetch
       children on-demand (on expand button click),
+      Notice: this is not so simple, because we need to fetch children
+              to set "unread_children", but we can fetch only flags instead of
+              all headers for each child
     - after message delete we shouldn't reload the whole list, only the thread
       in which the message was
@@ -31 +35 @@
     - replace expand_unread() (list.js) with something universal,
       e.g. expand_all('unread'), because list widget could be used not for messages only
-    - mark root message with unread children as underlined subject instead
-      of unread_children icon
     - reset autoexpand feature if collapse-all/expand-all was used. Save state for next page
       in the same folder. E.g. autoexpand is on, list is displayed with expanded
@@ -41 +43 @@
       listing the folders)
     - thread css: message row height, thread/status icon alignment
+    - use underlined subject only if thread is collapsed
 
 KNOWN ISSUES:
     - after message(s) deletion the whole list is reloaded (see TODO),
-    - unread_children icon is not shown after changing message status to
-      Seen, when root is e.g. "replied", also when thread contains many unread
-      children. For me, we should use underlined subject instead of unread_children 
-      icon

branches/devel-threads/program/include/rcube_imap.php

@@ -859 +859 @@
         $headers[$idx]->parent_uid = end($parents);
         if (!$header->seen)
-          $headers[$parents[0]]->unread_children = true;
+          $headers[$parents[0]]->unread_children++;
         }
       array_push($parents, $header->uid);

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

@@ -441 +441 @@
       }
 
+    // global variable 'subject_col' may be not defined yet
+    if (this.env.subject_col == null && this.env.coltypes)
+      {
+      var found;
+      if((found = find_in_array('subject', this.env.coltypes)) >= 0)
+        this.set_env('subject_col', found);
+      }
+
     // set eventhandler to message icon
-    if (row.icon = row.obj.getElementsByTagName('td')[0].getElementsByTagName('img')[0])
+    if (this.env.subject_col != null
+        && (row.icon = row.obj.getElementsByTagName('td')[this.env.subject_col].getElementsByTagName('img')[0]))
       {
       var p = this;
@@ -451 +460 @@
 
     // global variable 'flagged_col' may be not defined yet
-    if (!this.env.flagged_col && this.env.coltypes)
+    if (this.env.flagged_col == null && this.env.coltypes)
       {
       var found;
@@ -459 +468 @@
 
     // set eventhandler to flag icon, if icon found
-    if (this.env.flagged_col && (row.flagged_icon = row.obj.getElementsByTagName('td')[this.env.flagged_col].getElementsByTagName('img')[0]))
+    if (this.env.flagged_col != null
+         && (row.flagged_icon = row.obj.getElementsByTagName('td')[this.env.flagged_col].getElementsByTagName('img')[0]))
       {
       var p = this;
@@ -1626 +1636 @@
         {
         this.set_message(id, 'unread', false);
-        this.update_parents(id, 'read');
+        this.update_thread_root(id, 'read');
         if (this.env.unread_counts[this.env.mailbox])
           {
@@ -1815 +1825 @@
   };
 
-  // update parents in a thread
-  this.update_parents = function(uid, flag)
+  // update parent in a thread
+  this.update_thread_root = function(uid, flag)
+  {
+    if (!this.env.threading)
+      return;
+
+    var root = this.find_thread_root(uid);
+    
+    if (uid == root)
+      return;
+
+    var p = this.message_list.rows[root];
+
+    if (flag == 'read' && p.unread_children) {
+      p.unread_children--;
+    } else if (flag == 'unread' && p.has_children) {
+      // unread_children may be undefined
+      p.unread_children = p.unread_children ? p.unread_children + 1 : 1;
+    } else {
+      return;
+    }
+
+    this.set_message_icon(root);
+  };
+
+  // finds root message for specified thread
+  this.find_thread_root = function(uid)
   {
     var r = this.message_list.rows[uid];
-    if (r.parent_uid) {
-      var p = this.message_list.rows[r.parent_uid];
-      if (flag == 'read' && p.unread_children > 0) {
-        p.unread_children--;
-      } else if (flag == 'unread') {
-        p.unread_children++;
-      } else {
-        return;
-      }
-      this.set_message_icon(r.parent_uid);
-      this.update_parents(r.parent_uid, flag);
-    }
-  };
+  
+    if (r.parent_uid)
+      return this.find_thread_root(r.parent_uid);
+    else
+      return uid;
+  }
 
   // set message icon
@@ -1841 +1869 @@
     if (!rows[uid])
       return false;
-    if (!rows[uid].unread && rows[uid].unread_children > 0 && this.env.unreadchildrenicon) {
+    if (!rows[uid].unread && rows[uid].unread_children && this.env.unreadchildrenicon) {
       icn_src = this.env.unreadchildrenicon;
     }
@@ -1869 +1897 @@
     else if (!rows[uid].flagged && this.env.unflaggedicon)
       icn_src = this.env.unflaggedicon;
+
+    if (rows[uid].has_children) {
+      if (!rows[uid].unread && rows[uid].unread_children)
+        $(rows[uid].obj).addClass('unroot');
+      else
+        $(rows[uid].obj).removeClass('unroot');
+    }
 
     if (rows[uid].flagged_icon && icn_src)
@@ -1904 +1939 @@
     if (flag)
       this.set_message_status(uid, flag, status);
-    
+
     var rowobj = $(rows[uid].obj);
     if (rows[uid].unread && rows[uid].classname.indexOf('unread')<0)
@@ -2049 +2084 @@
     var a_uids = new Array();
     var r_uids = new Array();
-    var selection = this.message_list ? this.message_list.get_selection('mark') : new Array();
+    var selection = this.message_list ? this.message_list.get_selection() : new Array();
 
     if (uid)
@@ -2111 +2146 @@
 
     for (var i=0; i<a_uids.length; i++)
-      this.update_parents(a_uids[i], flag);
+      this.update_thread_root(a_uids[i], flag);
   };
 
@@ -3958 +3993 @@
         + (flags.deleted ? ' deleted' : '')
         + (flags.flagged ? ' flagged' : '')
+        + (flags.unread_children && !flags.unread ? ' unroot' : '')
         + (this.message_list.in_selection(uid) ? ' selected' : '');
 

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

@@ -328 +328 @@
       $attach_icon = $attrib['attachmenticon'];
         
-    $out .= sprintf('<tr id="rcmrow%d" class="message%s%s%s%s"%s>'."\n",
+    $out .= sprintf('<tr id="rcmrow%d" class="message%s%s%s%s%s"%s>'."\n",
                     $header->uid,
                     $header->seen ? '' : ' unread',
                     $header->deleted ? ' deleted' : '',
                     $header->flagged ? ' flagged' : '',
+                    $header->unread_children && $header->seen ? ' unroot' : '',
                     $zebra_class,
                     ($header->depth) ? ' style="display: none"' : '');

branches/devel-threads/skins/default/mail.css

@@ -797 +797 @@
 }
 
+
 #messagelist tbody tr td.flag img:hover,
 #messagelist thead tr td.flag img
@@ -808 +809 @@
   vertical-align: middle;
   width: 99%;
+}
+
+/* thread parent message with unread children */
+#messagelist tbody tr.unroot td.subject a
+{
+  text-decoration: underline;
 }
 

branches/devel-threads/skins/default/templates/mail.html

@@ -61 +61 @@
   flaggedIcon="/images/icons/flagged.png"
   unflaggedIcon="/images/icons/blank.gif"
-  unreadchildrenIcon="/images/icons/unread_children.png"
   optionsmenuIcon="/images/icons/columnpicker.gif" />
 </div>