Merge pull request #811 from mrkowalski/patch-1

Fix charset for application/javascript files

1 files changed, 1 insertions, 1 deletions

diff --git a/bottle.py b/bottle.py
index f6e14b0..fd1a20d 100644
--- a/bottle.py
+++ b/bottle.py
@@ -2678,7 +2678,7 @@ def static_file(filename, root,
         if encoding: headers['Content-Encoding'] = encoding
 
     if mimetype:
-        if mimetype[:5] == 'text/' and charset and 'charset' not in mimetype:
+        if (mimetype[:5] == 'text/' or mimetype == 'application/javascript') and charset and 'charset' not in mimetype:
             mimetype += '; charset=%s' % charset
         headers['Content-Type'] = mimetype