summaryrefslogtreecommitdiff
path: root/compressor/js.py
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-02-17 03:14:02 +0100
committerJannis Leidel <jannis@leidel.info>2011-02-17 03:14:02 +0100
commit253efbb2066200778a897187de513ab8f6736d91 (patch)
tree995f47a5dbaeeb4a9451df63cb54d741eb1138ea /compressor/js.py
parent55a02cfb7ce1d5fd1e2405df87b84b931ad022ee (diff)
parentc199bff8cbf31e3f2d88f8030f3ad7edc9b0c959 (diff)
downloaddjango-compressor-0.6b2.tar.gz
Merge branch 'release/0.6b2'0.6b2
Diffstat (limited to 'compressor/js.py')
-rw-r--r--compressor/js.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/compressor/js.py b/compressor/js.py
index f95d373..dddb9d0 100644
--- a/compressor/js.py
+++ b/compressor/js.py
@@ -5,12 +5,11 @@ from compressor.exceptions import UncompressableFileError
class JsCompressor(Compressor):
- def __init__(self, content, output_prefix="js"):
+ def __init__(self, content=None, output_prefix="js"):
super(JsCompressor, self).__init__(content, output_prefix)
- self.extension = ".js"
self.template_name = "compressor/js.html"
self.template_name_inline = "compressor/js_inline.html"
- self.filters = settings.COMPRESS_JS_FILTERS
+ self.filters = list(settings.COMPRESS_JS_FILTERS)
self.type = 'js'
def split_contents(self):