Changeset 1819 in subversion

Timestamp:

Sep 18, 2008 6:14:16 AM (5 years ago)

Author:

alec

Message:

#1484805: fix next/last page buttons when new message is added to the list + remove last message

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (1 diff)
• js/list.js (modified) (3 diffs)
• steps/mail/check_recent.inc (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -3560 +3560 @@
 
     this.message_list.insert_row(row, attop);
+
+    // remove 'old' row
+    if (attop && this.env.pagesize && this.message_list.rowcount > this.env.pagesize)
+      {
+        var uid = this.message_list.get_last_row();
+        this.message_list.remove_row(uid);
+        this.message_list.clear_selection(uid);
+      }
     };
 

trunk/roundcubemail/program/js/list.js

@@ -291 +291 @@
 
 /**
- * get next and previous rows that are not hidden
+ * get next/previous/last rows that are not hidden
  */
 get_next_row: function()
@@ -319 +319 @@
 },
 
-
-// selects or unselects the proper row depending on the modifier key pressed
+get_last_row: function()
+{
+  if (this.rowcount)
+    {
+    var rows = this.list.tBodies[0].rows;
+
+    for(var i=rows.length-1; i>=0; i--)
+      if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=]+)/i) && this.rows[RegExp.$1] != null)
+        return RegExp.$1;
+    }
+
+  return null;
+},
+
+
+/**
+ * selects or unselects the proper row depending on the modifier key pressed
+ */
 select_row: function(id, mod_key, with_mouse)
 {
@@ -483 +499 @@
 
 /**
- * Unselect all selected rows
- */
-clear_selection: function()
+ * Unselect selected row(s)
+ */
+clear_selection: function(id)
 {
   var num_select = this.selection.length;
-  for (var n=0; n<this.selection.length; n++)
-    if (this.rows[this.selection[n]])
-    {
-      this.set_classname(this.rows[this.selection[n]].obj, 'selected', false);
-      this.set_classname(this.rows[this.selection[n]].obj, 'unfocused', false);
-    }
-
-  this.selection = new Array();
-  
-  if (num_select)
+
+  // one row
+  if (id)
+    {
+    for (var n=0; n<this.selection.length; n++)
+      if (this.selection[n] == id)
+        {
+        this.selection.splice(n,1);
+        break;
+        }
+    }
+  // all rows
+  else
+    {
+    for (var n=0; n<this.selection.length; n++)
+      if (this.rows[this.selection[n]])
+        {
+        this.set_classname(this.rows[this.selection[n]].obj, 'selected', false);
+        this.set_classname(this.rows[this.selection[n]].obj, 'unfocused', false);
+        }
+    
+    this.selection = new Array();
+    }
+
+  if (num_select && !this.selection.length)
     this.trigger_event('select');
 },

trunk/roundcubemail/program/steps/mail/check_recent.inc

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