From 4b2ebcb3563b85180485c94eaf9a0ed9d8110f6f Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Fri, 22 Oct 2010 16:53:57 -0700 Subject: Bug 473557: Make the "Collapse All Comments" link work properly even when the "comment order" preference is set to "newest to oldest with description at top" r=mkanat, a=mkanat --- js/comments.js | 10 +++++----- template/en/default/bug/comments.html.tmpl | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/comments.js b/js/comments.js index 697cedd20..2f1a14406 100644 --- a/js/comments.js +++ b/js/comments.js @@ -44,18 +44,18 @@ function toggle_comment_display(link, comment_id) { collapse_comment(link, comment); } -function toggle_all_comments(action, comments_size) { - var num_comments = comments_size; - +function toggle_all_comments(action) { // If for some given ID the comment doesn't exist, this doesn't mean // there are no more comments, but that the comment is private and // the user is not allowed to view it. - for (var id = 0; id < num_comments; id++) { - var comment = document.getElementById('comment_text_' + id); + var comments = YAHOO.util.Dom.getElementsByClassName('bz_comment_text'); + for (var i = 0; i < comments.length; i++) { + var comment = comments[i]; if (!comment) continue; + var id = comments[i].id.match(/\d*$/); var link = document.getElementById('comment_link_' + id); if (action == 'collapse') collapse_comment(link, comment); diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 4f7795b12..580ba6b5e 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -82,9 +82,9 @@ [% IF mode == "edit" %]