threaded_comments.js should be added using add_script rather than directly from ticket.html

[Jun Omae]

The threaded_comments.js is added directly from ticket.html. I think it should be added using add_script rather than. Currently only this script is added from templates.

$ git grep -n htdocs_location mirror/1.6-stable -- '*.html'
mirror/1.6-stable:trac/templates/about.html:28:        <img src="${chrome.htdocs_location}trac_banner.png"
mirror/1.6-stable:trac/templates/about.html:56:        <img src="${chrome.htdocs_location}python.png"
mirror/1.6-stable:trac/templates/theme.html:147:         ><img src="${chrome.htdocs_location}trac_logo_mini.png" height="30"
mirror/1.6-stable:trac/ticket/templates/ticket.html:33:    <script src="${chrome.htdocs_location}js/threaded_comments.js"></script>
$ git grep -n '<script\s*src=' mirror/1.6-stable -- '*.html'
mirror/1.6-stable:trac/ticket/templates/ticket.html:33:    <script src="${chrome.htdocs_location}js/threaded_comments.js"></script>

trac/ticket/templates/ticket.html

@@ -29 +29 @@
 
     ${ super() }
 
-    # if ticket.exists:
-    <script src="${chrome.htdocs_location}js/threaded_comments.js"></script>
-    # endif
     <script>
       jQuery(function($) {
         $("div.description").find("h1,h2,h3,h4,h5,h6")

trac/ticket/web_ui.py

@@ -757 +757 @@
                               'changes': data['changes'],
                               })
         add_stylesheet(req, 'common/css/ticket.css')
+        add_script(req, 'common/js/threaded_comments.js')
         chrome = Chrome(self.env)
         chrome.add_wiki_toolbars(req)
         if not data['disable_submit']:

[Jun Omae]

Fixed in [17834] and merged in [17835].