Changeset fa59965 in github

Timestamp:

Jul 18, 2011 1:35:12 PM (22 months ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

8c37422

Parents:

3a9f795

Message:

Asynchronously load contacts after page load

Location:

program

Files:

• js/app.js (modified) (1 diff)
• steps/addressbook/func.inc (modified) (7 diffs)

program/js/app.js

@@ -339 +339 @@
         this.enable_command('add', 'import', this.env.writable_source);
         this.enable_command('list', 'listgroup', 'advanced-search', true);
+        
+        // load contacts of selected source
+        this.command('list', this.env.source);
         break;
 

program/steps/addressbook/func.inc

@@ -85 +85 @@
     $_SESSION['addressbooks_count'] = count($js_list);
     $_SESSION['addressbooks_count_writeable'] = $writeable;
+    
+    if (!strlen($source))
+      $source = strval(key($js_list));
 
     $CONTACTS = rcmail_contact_source($source, true);
@@ -181 +184 @@
     // currently selected source
     $current = get_input_value('_source', RCUBE_INPUT_GPC);
-    if (!strlen($current) || !isset($sources[$source]))
-        $current = strval(key($sources));
 
     foreach ($sources as $j => $source) {
@@ -248 +249 @@
 
 
-// return the message list as HTML table
+// return the contacts list as HTML table
 function rcmail_contacts_list($attrib)
 {
@@ -255 +256 @@
     // define list of cols to be displayed
     $a_show_cols = array('name');
-
-    // count contacts for this user
-    $result = $CONTACTS->list_records($a_show_cols);
 
     // add id to message list table if not specified
@@ -264 +262 @@
 
     // create XHTML table
-    $out = rcube_table_output($attrib, $result->records, $a_show_cols, $CONTACTS->primary_key);
+    $out = rcube_table_output($attrib, array(), $a_show_cols, $CONTACTS->primary_key);
 
     // set client env
     $OUTPUT->add_gui_object('contactslist', $attrib['id']);
     $OUTPUT->set_env('current_page', (int)$CONTACTS->list_page);
-    $OUTPUT->set_env('pagecount', ceil($result->count/$CONTACTS->page_size));
     $OUTPUT->include_script('list.js');
 
@@ -332 +329 @@
     $OUTPUT->add_gui_object('countdisplay', $attrib['id']);
 
-    return html::span($attrib, rcmail_get_rowcount_text());
+    return html::span($attrib, rcube_label('loading'));
 }
 
@@ -343 +340 @@
     if (!$result) {
         $result = $CONTACTS->get_result();
-    }
-    if (!$result) {
-        $result = $CONTACTS->count();
     }