Allow to set script charset in add_script

[martin@…]

The function add_script in trac.web.chrome should allow the programmer to set a charset attribute for the script he/she is adding.

I wrote a small path for this:

trac/templates/layout.html

@@ -20 +20 @@
       <link type="application/opensearchdescription+xml" rel="search"
             href="${href.search('opensearch')}" title="Search $project.name"/>
     </py:if>
-    <script py:for="script in chrome.scripts"
+    <script py:for="script in chrome.scripts" charset="${script.charset}"
             type="${script.type}" src="${script.href}"></script>
     ${Markup('&lt;!--[if lt IE 7]&gt;')}
     <script type="text/javascript" src="${chrome.htdocs_location}js/ie_pre7_hacks.js"></script>

Trac-0.11.1-py2.5.egg

@@ -82 +82 @@
             href = href.chrome
     add_link(req, 'stylesheet', href(filename), mimetype=mimetype)
 
-def add_script(req, filename, mimetype='text/javascript'):
+def add_script(req, filename, mimetype='text/javascript', charset='UTF-8'):
     """Add a reference to an external javascript file to the template.
     
     If the filename is absolute (i.e. starts with a slash), the generated link
@@ -101 +101 @@
         if not filename.startswith('/'):
             href = href.chrome
         path = filename
-    script = {'href': href(path), 'type': mimetype}
+    script = {'href': href(path), 'type': mimetype, 'charset': charset }
 
     req.chrome.setdefault('scripts', []).append(script)
     scriptset.add(filename)

[Christian Boos]

I think it defaults anyway to UTF-8, so the argument should probably be: , charset=None): .

[Christian Boos]

Patch looks good, I'll test and apply it.

[Christian Boos]

Done in r10196, along with a small clean-up of layout.html. Thanks for the patch!