From 29b39739df3393f138dbdd98591e1331af0393ad Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 04 Nov 2010 09:48:17 -0400
Subject: [PATCH] - Improve responsiveness of messages displaying (#1486986)
---
program/steps/mail/func.inc | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 11df128..1237c92 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -423,14 +423,16 @@
function rcmail_messagecount_display($attrib)
{
- global $IMAP, $OUTPUT;
+ global $RCMAIL;
if (!$attrib['id'])
$attrib['id'] = 'rcmcountdisplay';
- $OUTPUT->add_gui_object('countdisplay', $attrib['id']);
+ $RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);
- return html::span($attrib, rcmail_get_messagecount_text());
+ $content = $RCMAIL->action != 'show' ? rcmail_get_messagecount_text() : rcube_label('loading');
+
+ return html::span($attrib, $content);
}
@@ -495,14 +497,7 @@
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)
$page = $IMAP->list_page;
--
Gitblit v1.9.1