Changeset 6053 in subversion
- Timestamp:
- Apr 8, 2012 12:42:50 PM (14 months ago)
- File:
-
- 1 edited
-
trunk/roundcubemail/program/js/app.js (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/roundcubemail/program/js/app.js
r6052 r6053 2127 2127 while (new_row) { 2128 2128 if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) { 2129 this.message_list.expand_all(r);2130 this.set_unread_children(r.uid);2129 this.message_list.expand_all(r); 2130 this.set_unread_children(r.uid); 2131 2131 } 2132 2132 new_row = new_row.nextSibling; … … 2313 2313 while (row) { 2314 2314 if (row.nodeType == 1 && (r = rows[row.uid])) { 2315 if (!r.depth || r.depth <= depth)2316 break;2317 2318 r.depth--; // move left2315 if (!r.depth || r.depth <= depth) 2316 break; 2317 2318 r.depth--; // move left 2319 2319 // reset width and clear the content of a tab, icons will be added later 2320 $('#rcmtab'+r.uid).width(r.depth * 15).html('');2320 $('#rcmtab'+r.uid).width(r.depth * 15).html(''); 2321 2321 if (!r.depth) { // a new root 2322 count++; // increase roots count2323 r.parent_uid = 0;2324 if (r.has_children) {2325 // replace 'leaf' with 'collapsed'2326 $('#rcmrow'+r.uid+' '+'.leaf:first')2322 count++; // increase roots count 2323 r.parent_uid = 0; 2324 if (r.has_children) { 2325 // replace 'leaf' with 'collapsed' 2326 $('#rcmrow'+r.uid+' '+'.leaf:first') 2327 2327 .attr('id', 'rcmexpando' + r.uid) 2328 .attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))2329 .bind('mousedown', {uid:r.uid, p:this},2330 function(e) { return e.data.p.expand_message_row(e, e.data.uid); });2331 2332 r.unread_children = 0;2333 roots.push(r);2334 }2335 // show if it was hidden2336 if (r.obj.style.display == 'none')2337 $(r.obj).show();2338 }2339 else {2340 if (r.depth == depth)2341 r.parent_uid = parent;2342 if (r.unread && roots.length)2343 roots[roots.length-1].unread_children++;2344 }2345 }2346 row = row.nextSibling;2328 .attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed')) 2329 .bind('mousedown', {uid:r.uid, p:this}, 2330 function(e) { return e.data.p.expand_message_row(e, e.data.uid); }); 2331 2332 r.unread_children = 0; 2333 roots.push(r); 2334 } 2335 // show if it was hidden 2336 if (r.obj.style.display == 'none') 2337 $(r.obj).show(); 2338 } 2339 else { 2340 if (r.depth == depth) 2341 r.parent_uid = parent; 2342 if (r.unread && roots.length) 2343 roots[roots.length-1].unread_children++; 2344 } 2345 } 2346 row = row.nextSibling; 2347 2347 } 2348 2348 … … 2363 2363 while (row) { 2364 2364 if (row.nodeType == 1 && (r = rows[row.uid])) { 2365 if (!r.depth && cnt)2366 cnt--;2365 if (!r.depth && cnt) 2366 cnt--; 2367 2367 2368 2368 if (!cnt) 2369 this.message_list.remove_row(row.uid);2370 }2371 row = row.nextSibling;2369 this.message_list.remove_row(row.uid); 2370 } 2371 row = row.nextSibling; 2372 2372 } 2373 2373 }; … … 2806 2806 r_uids[r_uids.length] = uid; 2807 2807 2808 if (this.env.skip_deleted) {2809 count += this.update_thread(uid);2808 if (this.env.skip_deleted) { 2809 count += this.update_thread(uid); 2810 2810 this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1)); 2811 }2812 else2813 this.set_message(uid, 'deleted', true);2811 } 2812 else 2813 this.set_message(uid, 'deleted', true); 2814 2814 } 2815 2815 } … … 3014 3014 .attr('autocomplete', 'off'); 3015 3015 }; 3016 3016 3017 3017 this.compose_recipient_select = function(list) 3018 3018 { … … 3023 3023 { 3024 3024 var recipients = [], input = $('#_'+field); 3025 3025 3026 3026 if (this.contact_list && this.contact_list.selection.length) { 3027 3027 for (var id, n=0; n < this.contact_list.selection.length; n++) { … … 6341 6341 rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener; 6342 6342 rcube_webmail.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent; 6343
Note: See TracChangeset
for help on using the changeset viewer.
