[Svn] r4684 - trunk/roundcubemail/program/js

trac at roundcube.net trac at roundcube.net
Fri Apr 22 10:18:10 CEST 2011


Author: alec
Date: 2011-04-22 03:18:10 -0500 (Fri, 22 Apr 2011)
New Revision: 4684

Modified:
   trunk/roundcubemail/program/js/app.js
Log:
- Fix update_contact_row() was setting wrong ID when newcid=null


Modified: trunk/roundcubemail/program/js/app.js
===================================================================
--- trunk/roundcubemail/program/js/app.js	2011-04-22 08:03:40 UTC (rev 4683)
+++ trunk/roundcubemail/program/js/app.js	2011-04-22 08:18:10 UTC (rev 4684)
@@ -3789,28 +3789,25 @@
   // update a contact record in the list
   this.update_contact_row = function(cid, cols_arr, newcid)
   {
+    var c, row, list = this.contact_list;
+
     cid = String(cid).replace(this.identifier_expr, '_');
-    newcid = String(newcid).replace(this.identifier_expr, '_');
 
-    var row;
-    if (this.contact_list.rows[cid] && (row = this.contact_list.rows[cid].obj)) {
-      for (var c=0; c<cols_arr.length; c++)
+    if (list.rows[cid] && (row = list.rows[cid].obj)) {
+      for (c=0; c<cols_arr.length; c++)
         if (row.cells[c])
           $(row.cells[c]).html(cols_arr[c]);
 
       // cid change
       if (newcid) {
+        newcid = String(newcid).replace(this.identifier_expr, '_');
         row.id = 'rcmrow' + newcid;
-        this.contact_list.remove_row(cid);
-        this.contact_list.init_row(row);
-        this.contact_list.selection[0] = newcid;
+        list.remove_row(cid);
+        list.init_row(row);
+        list.selection[0] = newcid;
         row.style.display = '';
       }
-
-      return true;
     }
-
-    return false;
   };
 
   // add row to contacts list

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list