Changeset 29b3973 in github

Timestamp:

Nov 4, 2010 9:48:17 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

30b3022

Parents:

b8d8cbd

Message:

• Improve responsiveness of messages displaying (#1486986)

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (2 diffs)
• program/steps/mail/func.inc (modified) (2 diffs)
• program/steps/mail/pagenav.inc (added)
• program/steps/mail/show.inc (modified) (1 diff)

CHANGELOG

@@ -63 +63 @@
 - Add missing confirmation/error messages on contact/group/message actions (#1486845)
 - Add 'loading' message on message move/copy/delete/mark actions
+- Improve responsiveness of messages displaying (#1486986)
 
 RELEASE 0.4.2

program/js/app.js

@@ -211 +211 @@
           this.enable_command('reply-list', this.env.list_post);
 
-          if (this.env.next_uid) {
-            this.enable_command('nextmessage', 'lastmessage', true);
-          }
-          if (this.env.prev_uid) {
-            this.enable_command('previousmessage', 'firstmessage', true);
+          if (this.env.action == 'show') {
+            this.http_request('pagenav', '_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox),
+              this.display_message('', 'loading'));
           }
 
@@ -4596 +4594 @@
       id = type + date.getTime();
 
-    // The same message of type 'loading' is already displayed
-    if (type == 'loading' && this.messages[msg]) {
-       this.messages[msg].elements.push(id);
-       return id;
+    if (type == 'loading') {
+      if (!msg)
+        msg = this.get_label('loading');
+
+      // The same message of type 'loading' is already displayed
+      if (this.messages[msg]) {
+        this.messages[msg].elements.push(id);
+        return id;
+      }
     }
 

program/steps/mail/func.inc

@@ -424 +424 @@
 function rcmail_messagecount_display($attrib)
   {
-  global $IMAP, $OUTPUT;
+  global $RCMAIL;
 
   if (!$attrib['id'])
     $attrib['id'] = 'rcmcountdisplay';
 
-  $OUTPUT->add_gui_object('countdisplay', $attrib['id']);
-
-  return html::span($attrib, rcmail_get_messagecount_text());
+  $RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);
+
+  $content =  $RCMAIL->action != 'show' ? rcmail_get_messagecount_text() : rcube_label('loading');
+
+  return html::span($attrib, $content);
   }
 
@@ -496 +498 @@
 function rcmail_get_messagecount_text($count=NULL, $page=NULL)
   {
-  global $RCMAIL, $IMAP, $MESSAGE;
-
-  if (isset($MESSAGE->index))
-    {
-    return rcube_label(array('name' => 'messagenrof',
-        'vars' => array('nr'  => $MESSAGE->index+1,
-        'count' => $count!==NULL ? $count : $IMAP->messagecount(NULL, 'ALL')))); // Only messages, no threads here
-    }
+  global $RCMAIL, $IMAP;
 
   if ($page===NULL)

program/steps/mail/show.inc

@@ -95 +95 @@
   }
 
-  // get previous, first, next and last message UID
-  if ($RCMAIL->action != 'preview' && $RCMAIL->action != 'print')
-    {
-    $next = $prev = $first = $last = -1;
-
-    if ($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] != 'DESC'
-        && empty($_REQUEST['_search']) && !$CONFIG['skip_deleted'] && !$IMAP->threading)
-      {
-      // this assumes that we are sorted by date_DESC
-      $cnt = $IMAP->messagecount();
-      $seq = $IMAP->get_id($MESSAGE->uid);
-      $MESSAGE->index = $cnt - $seq;
-
-      $prev = $IMAP->get_uid($seq + 1);
-      $first = $IMAP->get_uid($cnt);
-      $next = $IMAP->get_uid($seq - 1);
-      $last = $IMAP->get_uid(1);
-      }
-    else 
-      {
-      // Only if we use custom sorting
-      $a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']);
-
-      $MESSAGE->index = array_search($IMAP->get_id($MESSAGE->uid), $a_msg_index);
-
-      $count = count($a_msg_index);
-      $prev = isset($a_msg_index[$MESSAGE->index-1]) ? $IMAP->get_uid($a_msg_index[$MESSAGE->index-1]) : -1;
-      $first = $count > 1 ? $IMAP->get_uid($a_msg_index[0]) : -1;
-      $next = isset($a_msg_index[$MESSAGE->index+1]) ? $IMAP->get_uid($a_msg_index[$MESSAGE->index+1]) : -1;
-      $last = $count > 1 ? $IMAP->get_uid($a_msg_index[$count-1]) : -1;
-      }
-
-    if ($prev > 0)
-      $OUTPUT->set_env('prev_uid', $prev);
-    if ($first > 0)
-      $OUTPUT->set_env('first_uid', $first);
-    if ($next > 0)
-      $OUTPUT->set_env('next_uid', $next);
-    if ($last > 0)
-      $OUTPUT->set_env('last_uid', $last);
-
-    // Don't need a real messages count value
-    $OUTPUT->set_env('messagecount', 1);
-    }
-
   if (!$MESSAGE->headers->seen && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0)))
     $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid,