Changeset 3142 in subversion

Timestamp:

Nov 30, 2009 3:55:57 AM (3 years ago)

Author:

alec

Message:

• don't refresh messages list on message delete
• handle threading in mark.inc
• fix: threads expanding in Google Chrome
• fix: list options menu not working after options save

Location:

branches/devel-threads

Files:

• THREADS (modified) (3 diffs)
• program/include/rcube_imap.php (modified) (1 diff)
• program/js/app.js (modified) (15 diffs)
• program/js/common.js (modified) (1 diff)
• program/js/list.js (modified) (12 diffs)
• program/steps/mail/check_recent.inc (modified) (1 diff)
• program/steps/mail/func.inc (modified) (5 diffs)
• program/steps/mail/list.inc (modified) (1 diff)
• program/steps/mail/mark.inc (modified) (3 diffs)
• program/steps/mail/move_del.inc (modified) (1 diff)
• skins/default/functions.js (modified) (3 diffs)

branches/devel-threads/THREADS

@@ -10 +10 @@
       supported by server and implement REFS sorting in Roundcube
     - use underlined subject for root with unread children (icon is still supported)
+    - on deleting messages the whole list isn't refreshed
 
 CHANGES IN RELATION TO TRUNK (for pasting into CHANGELOG after merge)
@@ -20 +21 @@
 TODO (must have):
     - threads caching,
-    - after message delete we shouldn't reload the whole list, only the thread
-      in which the message was
     - "Expand All Unread" button
 TODO (other):
@@ -38 +37 @@
 TODO (by the way):
     - use jQuery.inArray instead of find_in_array() (common.js)
+    - use only one function (js) to generate messages list
 
 KNOWN ISSUES:
-    - after message(s) deletion the whole list is reloaded (see TODO),
-    - the same with a new message (check_recent)
+    - on new message (check_recent) the whole list is reloaded
     - css issues on IE6-7
+

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

@@ -757 +757 @@
 
     return $this->_fetch_thread_headers($mailbox, $thread_tree, $msg_depth, $has_children,
-        $msg_index, $page, $lice);
+        $msg_index, $page, $slice);
     }
 

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

@@ -176 +176 @@
           this.set_message_coltypes(this.env.coltypes);
           this.message_list.init();
-          this.enable_command('toggle_status', 'toggle_flag', true);
+          this.enable_command('toggle_status', 'toggle_flag', 'menu-open', true);
           
           if (this.gui_objects.mailcontframe)
@@ -483 +483 @@
         else if (this.env.permaurl)
           parent.location.href = this.env.permaurl;
+        break;
+
+      case 'menu-open':
+        this.triggerEvent('menu-open', {props:props});
+        return false;
         break;
 
@@ -647 +652 @@
         // mail task
         if (this.task=='mail')
-        {
-          if (this.delete_messages() && this.env.threading)
-          {
-            // It is very hard to re-thread message list if some messages were removed from
-            // the middle of a thread (we need to fully implement RFC5256 algorythm, because
-            // we are a "disconnected client" if we re-threading without a servers help)
-            // Reload message list
-            this.list_mailbox(this.env.mailbox, this.env.current_page);
-          }
-        }
+          this.delete_messages();
         // addressbook task
         else if (this.task=='addressbook')
@@ -665 +661 @@
         break;
 
-
       // mail task commands
       case 'move':
       case 'moveto':
         if (this.task == 'mail')
-        {
           this.move_messages(props);
-          if (this.env.threading)
-          {
-            // The same as for 'delete'
-            this.list_mailbox(this.env.mailbox, this.env.current_page);
-          }
-        }
         else if (this.task == 'addressbook' && this.drag_active)
           this.copy_contact(null, props);
@@ -1563 +1551 @@
     if (this.env.threading)
       {
-      // XXX: This assumes that div width is hardcoded to 15px,
-      // Chris did it a bit differently in an original patch, he was adding so much divs as depth is
-      // I replaced logic in list.js:drag_mouse_move() so subject text is picked defferently, so
-      // either method of could be used (that was only the one problem I noted with these added divs).
-      // The same is true for an offline list (program/steps/mail/func.inc:rcmail_message_list()).
-      // Bubble
+      // This assumes that div width is hardcoded to 15px,
       var width = message.depth * 15;
       if (width)
@@ -1880 +1863 @@
     }
 
-  this.expunge_mailbox = function(mbox)
-    {
-    var lock = false;
-    var add_url = '';
-    
-    // lock interface if it's the active mailbox
-    if (mbox == this.env.mailbox)
-       {
-       lock = true;
-       this.set_busy(true, 'loading');
-       add_url = '&_reload=1';
-       }
-
-    // send request to server
-    var url = '_mbox='+urlencode(mbox);
-    this.http_post('expunge', url+add_url, lock);
-    };
-
-  this.purge_mailbox = function(mbox)
-    {
-    var lock = false;
-    var add_url = '';
-    
-    if (!confirm(this.get_label('purgefolderconfirm')))
-      return false;
-    
-    // lock interface if it's the active mailbox
-    if (mbox == this.env.mailbox)
-       {
-       lock = true;
-       this.set_busy(true, 'loading');
-       add_url = '&_reload=1';
-       }
-
-    // send request to server
-    var url = '_mbox='+urlencode(mbox);
-    this.http_post('purge', url+add_url, lock);
-    return true;
-    };
-
-  // test if purge command is allowed
-  this.purge_mailbox_test = function()
-  {
-    return (this.env.messagecount && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox 
-      || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter)) 
-      || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
-  };
-
   // update parent in a thread
   this.update_thread_root = function(uid, flag)
@@ -1965 +1900 @@
   }
 
+  // update thread indicators for all messages in a thread below the specified message
+  // return number of removed/added root level messages
+  this.update_thread = function (uid)
+  {
+    if (!this.env.threading)
+      return 0;
+
+    var rows = this.message_list.rows;
+    var row = rows[uid]
+    var depth = rows[uid].depth;
+    var r, parent, count = 0;
+    var roots = new Array();
+
+    if (!row.depth) // root message: decrease roots count
+      count--;
+    else if (row.unread) {
+      // update unread_children for thread root
+      var parent = this.find_thread_root(uid);
+      rows[parent].unread_children--;
+      this.set_unread_children(parent);
+      }
+
+    parent = row.parent_uid;
+
+    // childrens
+    row = row.obj.nextSibling;
+    while (row) {
+      if (row.nodeType == 1 && (r = rows[row.uid])) {
+        if (!r.depth || r.depth <= depth)
+          break;
+
+        r.depth--; // move left
+        $('#rcmtab'+r.uid).width(r.depth * 15);
+        if (!r.depth) { // a new root
+          count++; // increase roots count
+          r.parent_uid = 0;
+          if (r.has_children) {
+            // replace 'leaf' with 'collapsed'
+            $('#rcmrow'+r.uid+' '+'.leaf:first')
+              .attr('id', 'rcmexpando' + r.uid)
+              .attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
+              .bind('mousedown', {uid:r.uid, p:this},
+                function(e) { return e.data.p.expand_message_row(e, e.data.uid); });
+
+            r.unread_children = 0;
+            roots[roots.length] = r;
+            }
+          // show if it was hidden
+          if (r.obj.style.display == 'none')
+            $(r.obj).show();
+          }
+        else {
+          if (r.depth == depth)
+            r.parent_uid = parent;
+          if (r.unread && roots.length) {
+            roots[roots.length-1].unread_children++;
+            }
+          }
+        }
+        row = row.nextSibling;
+      }
+    
+    // update unread_children for roots
+    for (var i=0; i<roots.length; i++)
+      this.set_unread_children(roots[i].uid);
+
+    return count;
+  };
+
+  this.delete_excessive_thread_rows = function()
+  {
+    var rows = this.message_list.rows;    
+    var tbody = this.message_list.list.tBodies[0];
+    var row = tbody.firstChild;
+    var cnt = this.env.pagesize + 1;
+    
+    while (row) {
+      if (row.nodeType == 1 && (r = rows[row.uid])) {
+        if (!r.depth && cnt)
+          cnt--;
+
+        if (!cnt)
+          this.message_list.remove_row(row.uid);
+        }
+        row = row.nextSibling;
+      }
+  }
+
   // set message icon
   this.set_message_icon = function(uid)
@@ -2037 +2060 @@
 
     var rowobj = $(rows[uid].obj);
-    if (rows[uid].unread && rows[uid].classname.indexOf('unread')<0)
-      {
-      rows[uid].classname += ' unread';
+
+    if (rows[uid].unread && !rowobj.hasClass('unread'))
       rowobj.addClass('unread');
-      }
-    else if (!rows[uid].unread && rows[uid].classname.indexOf('unread')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
+    else if (!rows[uid].unread && rowobj.hasClass('unread'))
       rowobj.removeClass('unread');
-      }
-    
-    if (rows[uid].deleted && rows[uid].classname.indexOf('deleted')<0)
-      {
-      rows[uid].classname += ' deleted';
+    
+    if (rows[uid].deleted && !rowobj.hasClass('deleted'))
       rowobj.addClass('deleted');
-      }
-    else if (!rows[uid].deleted && rows[uid].classname.indexOf('deleted')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*deleted/, '');
+    else if (!rows[uid].deleted && rowobj.hasClass('deleted'))
       rowobj.removeClass('deleted');
-      }
-
-    if (rows[uid].flagged && rows[uid].classname.indexOf('flagged')<0)
-      {
-      rows[uid].classname += ' flagged';
+
+    if (rows[uid].flagged && !rowobj.hasClass('flagged'))
       rowobj.addClass('flagged');
-      }
-    else if (!rows[uid].flagged && rows[uid].classname.indexOf('flagged')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*flagged/, '');
+    else if (!rows[uid].flagged && rowobj.hasClass('flagged'))
       rowobj.removeClass('flagged');
-      }
 
     this.set_unread_children(uid);
@@ -2156 +2162 @@
     };
 
-  // Send a specifc request with UIDs of all selected messages
+  // Send a specifc moveto/delete request with UIDs of all selected messages
   // @private
-  this._with_selected_messages = function(action, lock, add_url, remove)
+  this._with_selected_messages = function(action, lock, add_url)
   {
     var a_uids = new Array();
+    var count = 0;
 
     if (this.env.uid)
@@ -2167 +2174 @@
     {
       var selection = this.message_list.get_selection();
-      var rows = this.message_list.rows;
       var id;
       for (var n=0; n<selection.length; n++) {
         id = selection[n];
         a_uids[a_uids.length] = id;
+        count += this.update_thread(id);
         this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
       }
@@ -2185 +2192 @@
     if (this.env.display_next && this.env.next_uid)
       add_url += '&_next_uid='+this.env.next_uid;
+
+    if (count < 0)
+      add_url += '&_count='+(count*-1);
+    else if (count > 0) 
+      // remove threads from the end of the list
+      this.delete_excessive_thread_rows();
 
     // send request to server
@@ -2320 +2333 @@
     var r_uids = new Array();
     var rows = this.message_list ? this.message_list.rows : new Array();
-    
+    var count = 0;
+
     for (var i=0; i<a_uids.length; i++)
       {
@@ -2329 +2343 @@
           r_uids[r_uids.length] = uid;
 
-        if (this.env.skip_deleted)
+        if (this.env.skip_deleted) {
+          count += this.update_thread(uid);
           this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
+          }
         else
           this.set_message(uid, 'deleted', true);
@@ -2337 +2353 @@
 
     // make sure there are no selected rows
-    if (this.env.skip_deleted && !this.env.display_next && this.message_list)
+    if (this.env.skip_deleted && this.message_list) {
+      if(!this.env.display_next)
       this.message_list.clear_selection();
+      if (count < 0)
+        add_url += '&_count='+(count*-1);
+      else if (count > 0) 
+        // remove threads from the end of the list
+        this.delete_excessive_thread_rows();
+      }
 
     add_url = '&_from='+(this.env.action ? this.env.action : '');
@@ -2374 +2397 @@
         this.set_message(uid, 'unread', false);
       }
+  };
+
+
+  /*********************************************************/
+  /*********       mailbox folders methods         *********/
+  /*********************************************************/
+
+  this.expunge_mailbox = function(mbox)
+    {
+    var lock = false;
+    var add_url = '';
+    
+    // lock interface if it's the active mailbox
+    if (mbox == this.env.mailbox)
+       {
+       lock = true;
+       this.set_busy(true, 'loading');
+       add_url = '&_reload=1';
+       }
+
+    // send request to server
+    var url = '_mbox='+urlencode(mbox);
+    this.http_post('expunge', url+add_url, lock);
+    };
+
+  this.purge_mailbox = function(mbox)
+    {
+    var lock = false;
+    var add_url = '';
+    
+    if (!confirm(this.get_label('purgefolderconfirm')))
+      return false;
+    
+    // lock interface if it's the active mailbox
+    if (mbox == this.env.mailbox)
+       {
+       lock = true;
+       this.set_busy(true, 'loading');
+       add_url = '&_reload=1';
+       }
+
+    // send request to server
+    var url = '_mbox='+urlencode(mbox);
+    this.http_post('purge', url+add_url, lock);
+    return true;
+    };
+
+  // test if purge command is allowed
+  this.purge_mailbox_test = function()
+  {
+    return (this.env.messagecount && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox 
+      || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter)) 
+      || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
   };
 

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

@@ -293 +293 @@
   else if (typeof e == 'object')
     e.event = evt;
-  
+
   if (this._events && this._events[evt] && !this._event_exec) {
     this._event_exec = true;

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

@@ -110 +110 @@
     var uid = RegExp.$1;
     row.uid = uid;
-    this.rows[uid] = {uid:uid, id:row.id, obj:row, classname:row.className};
+    this.rows[uid] = {uid:uid, id:row.id, obj:row};
 
     // set eventhandlers to table row
@@ -326 +326 @@
   var evtarget = rcube_event.get_target(e);
   var mod_key = rcube_event.get_modifier(e);
+
   // Don't select this message
   this.dont_select = true;
   // Don't treat double click on the expando as double click on the message.
   row.clicked = 0;
-  if (row.expanded)
-  {
+
+  if (row.expanded) {
     evtarget.className = "collapsed";
     if (mod_key == CONTROL_KEY || this.multiexpand)
@@ -338 +339 @@
       this.collapse(row);
   }
-  else
-  {
+  else {
     evtarget.className = "expanded";
     if (mod_key == CONTROL_KEY || this.multiexpand)
@@ -355 +355 @@
   var r;
 
-  while (new_row)
-  {
-    if (new_row.nodeType == 1)
-    {
+  while (new_row) {
+    if (new_row.nodeType == 1) {
       var r = this.rows[new_row.uid];
       if (r && r.depth <= depth)
@@ -370 +368 @@
 },
 
-
 expand: function(row)
 {
@@ -376 +373 @@
   var last_expanded_parent_depth;
 
-  if (row)
-  {
+  if (row) {
     row.expanded = true;
     depth = row.depth;
     new_row = row.obj.nextSibling;
   }
-  else
-  {
+  else {
     var tbody = this.list.tBodies[0];
     new_row = tbody.firstChild;
@@ -390 +385 @@
   }
 
-  while (new_row)
-  {
-    if (new_row.nodeType == 1)
-    {
+  while (new_row) {
+    if (new_row.nodeType == 1) {
       var r = this.rows[new_row.uid];
-      if (r)
-      {
-        if (row && r.depth <= depth)
+      if (r) {
+        if (row && (!r.depth || r.depth <= depth))
           break;
-        if (r.parent_uid)
-        {
+
+        if (r.parent_uid) {
           var p = this.rows[r.parent_uid];
-          if (p && p.expanded)
-          {
-            if ((row && p == row) || last_expanded_parent_depth >= p.depth - 1)
-            {
+          if (p && p.expanded) {
+            if ((row && p == row) || last_expanded_parent_depth >= p.depth - 1) {
               last_expanded_parent_depth = p.depth;
               $(new_row).show();
@@ -429 +419 @@
   var r;
 
-  if (row)
-  {
+  if (row) {
     row.expanded = false;
     depth = row.depth;
@@ -438 +427 @@
       return false; 
   }
-  else
-  {
+  else {
     var tbody = this.list.tBodies[0];
     new_row = tbody.firstChild;
@@ -446 +434 @@
 
   while (new_row) {
-    if (new_row.nodeType == 1)
-    {
+    if (new_row.nodeType == 1) {
       var r = this.rows[new_row.uid];
-      if (row && r.depth <= depth)
-        break;
-      if (row || r.depth)
-        new_row.style.display = 'none';
-      if (r.has_children) {
-        r.expanded = false;
-        var expando = document.getElementById('rcmexpando' + r.uid);
-        if (expando)
-          expando.className = 'collapsed';
+      if (r) {
+        if (row && (!r.depth || r.depth <= depth))
+          break;
+
+        if (row || r.depth)
+          new_row.style.display = 'none';
+        if (r.has_children) {
+          r.expanded = false;
+          var expando = document.getElementById('rcmexpando' + r.uid);
+          if (expando)
+            expando.className = 'collapsed';
+        }
       }
     }
@@ -471 +461 @@
   var r;
 
-  if (row)
-  {
+  if (row) {
     row.expanded = true;
     depth = row.depth;
     new_row = row.obj.nextSibling;
   }
-  else
-  {
+  else {
     var tbody = this.list.tBodies[0];
     new_row = tbody.firstChild;
@@ -484 +472 @@
   }
 
-  while (new_row)
-  {
-    if (new_row.nodeType == 1)
-    {
+  while (new_row) {
+    if (new_row.nodeType == 1) {
       var r = this.rows[new_row.uid];
-      if (row && r.depth <= depth)
-        break;
-      $(new_row).show();
-      if (r.has_children)
-      {
-        r.expanded = true;
-        var expando = document.getElementById('rcmexpando' + r.uid);
-        if (expando)
-          expando.className = 'expanded';
+      if (r) {
+        if (row && r.depth <= depth)
+          break;
+
+        $(new_row).show();
+        if (r.has_children) {
+          r.expanded = true;
+          var expando = document.getElementById('rcmexpando' + r.uid);
+          if (expando)
+            expando.className = 'expanded';
+        }
       }
     }

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

@@ -38 +38 @@
 
       $OUTPUT->set_env('messagecount', $all_count);
-      $OUTPUT->set_env('pagesize', $IMAP->page_size);
       $OUTPUT->set_env('pagecount', ceil($all_count/$IMAP->page_size));
       $OUTPUT->command('set_unread_count', $mbox_name, $unread_count, ($mbox_name == 'INBOX'));

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

@@ -94 +94 @@
     }
         
-  // set current mailbox in client environment
+  // set current mailbox and some other vars in client environment
   $OUTPUT->set_env('mailbox', $mbox_name);
+  $OUTPUT->set_env('pagesize', $IMAP->page_size);
   $OUTPUT->set_env('quota', $IMAP->get_capability('quota'));
   $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter());
@@ -142 +143 @@
 
   // get message headers
-  $a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order);
+  $a_headers = $IMAP->list_headers('', '', $_SESSION['sort_col'], $_SESSION['sort_order']);
 
   // add id to message list table if not specified
@@ -368 +369 @@
     $a_show_cols[$f] = 'to';
 
-  $browser = new rcube_browser;
-  
   $thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;
   
   $OUTPUT->command('set_message_coltypes', $a_show_cols, $thead);
+
+  if (empty($a_headers))
+    return;
 
   // remove 'attachment' and 'flag' columns, we don't need them here
@@ -379 +381 @@
   if(($key = array_search('flag', $a_show_cols)) !== FALSE)
     unset($a_show_cols[$key]);
+
+  $browser = new rcube_browser;
 
   if ($browser->ie && $replace)
@@ -504 +508 @@
       // list options menu link
       if ($col == 'subject' && !empty($attrib['optionsmenuicon'])) {
-          $list_menu = sprintf('<a href="#"><img src="%s%s" id="%s" align="absmiddle" style="%s" title="%s" alt="" /></a>',
+          $list_menu = sprintf('<a href="#" onclick="%s"><img src="%s%s" id="%s" align="absmiddle" style="%s" title="%s" alt="" /></a>',
+            'return '.JS_OBJECT_NAME.'.command(\'menu-open\', \'messagelistmenu\')',
             $skin_path,
             $attrib['optionsmenuicon'],

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

@@ -83 +83 @@
 
 // add message rows
+rcmail_js_message_list($a_headers, FALSE, TRUE, (bool) $cols);
 if (isset($a_headers) && count($a_headers))
 {
-  rcmail_js_message_list($a_headers, FALSE, TRUE, (bool) $cols);
   if ($search_request)
     $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));

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

@@ -37 +37 @@
   if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') {
     // count messages before changing anything
-    $old_count = $IMAP->messagecount();
+    $old_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
     $old_pages = ceil($old_count / $IMAP->page_size);
     $count = sizeof(explode(',', $uids));
@@ -76 +76 @@
       }
 
-      $msg_count      = $IMAP->messagecount();
+      $msg_count      = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
       $pages          = ceil($msg_count / $IMAP->page_size);
       $nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page;
@@ -103 +103 @@
       $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
 
+      if ($IMAP->threading)
+        $count = get_input_value('_count', RCUBE_INPUT_POST);
+
       // add new rows from next page (if any)
-      if (($jump_back || $nextpage_count > 0)) {
+      if ($count && ($jump_back || $nextpage_count > 0)) {
         $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
         $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];

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

@@ -117 +117 @@
   $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
 
+  if ($IMAP->threading)
+    $count = get_input_value('_count', RCUBE_INPUT_POST);
+
   // add new rows from next page (if any)
-  if ($addrows && ($jump_back || $nextpage_count > 0)) {
+  if ($addrows && $count && ($jump_back || $nextpage_count > 0)) {
     $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
     $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
 
     $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, $count);
-    if ($_SESSION['threads'])
-      // TODO: count number of roots deleted and slice that many roots from the end of $a_headers 
-      $OUTPUT->command('message_list.clear');
-    else
-      $a_headers = array_slice($a_headers, -$count, $count);
 
     rcmail_js_message_list($a_headers, false, false);

branches/devel-threads/skins/default/functions.js

@@ -126 +126 @@
   this.messagemenu = $('#messagemenu');
   this.listmenu = $('#listmenu');
-  this.add_listmenulink();
 }
 
 rcube_mail_ui.prototype = {
-
-add_listmenulink: function()
-{
-  var ref = rcube_find_object('listmenulink');
-  if (ref)
-    ref.onclick = function () { rcmail_ui.show_listmenu() };
-},
 
 show_markmenu: function(show)
@@ -223 +215 @@
 },
 
+listmenu_open: function(e)
+{
+  this.show_listmenu(true);
+},
+
 save_listmenu: function()
 {
@@ -287 +284 @@
   rcube_event.add_listener({ object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
   rcube_event.add_listener({ object:rcmail_ui, method:'body_keypress', event:'keypress' });
-  rcube_event.add_listener({ object:rcmail_ui, method:'add_listmenulink', event:'listupdate' });
-}
+  rcmail.addEventListener('menu-open', 'listmenu_open', rcmail_ui);
+}