Bug 974411: js/comments.js::toggle_all_comments() shouldn't try to match

non-comment elements r=gerv, a=glob

Bug 974411: js/comments.js::toggle_all_comments() shouldn't try to match
ad9b1495 · Byron Jones · 3ef245b2 · ad9b1495
Commit ad9b1495 authored Apr 09, 2014 by Byron Jones
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

comments.js js/comments.js +7 -4

No files found.
--- a/js/comments.js
+++ b/js/comments.js
@@ -40,13 +40,16 @@ function toggle_all_comments(action) {
        var comment = comments[i];
        if (!comment)
            continue;
-
-        var id = comments[i].id.match(/\d*$/);
+        var id = comment.id.match(/^comment_text_(\d*)$/);
+        if (!id)
+            continue;
+        id = id[1];
        var link = document.getElementById('comment_link_' + id);
-        if (action == 'collapse')
+        if (action == 'collapse') {
            collapse_comment(link, comment, id);
-        else
+        } else {
            expand_comment(link, comment, id);
+        }
    }
 }