Commit 900122b9 by Will Daly

Use UglifyJS to minify JavaScript in the LMS

parent c4eee8eb
...@@ -1211,7 +1211,7 @@ if os.path.isdir(DATA_DIR): ...@@ -1211,7 +1211,7 @@ if os.path.isdir(DATA_DIR):
PIPELINE_CSS_COMPRESSOR = None PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None PIPELINE_JS_COMPRESSOR = "pipeline.compressors.uglifyjs.UglifyJSCompressor"
STATICFILES_IGNORE_PATTERNS = ( STATICFILES_IGNORE_PATTERNS = (
"sass/*", "sass/*",
...@@ -1222,7 +1222,7 @@ STATICFILES_IGNORE_PATTERNS = ( ...@@ -1222,7 +1222,7 @@ STATICFILES_IGNORE_PATTERNS = (
"common_static", "common_static",
) )
PIPELINE_YUI_BINARY = 'yui-compressor' PIPELINE_UGLIFYJS_BINARY='node_modules/.bin/uglifyjs'
# Setting that will only affect the edX version of django-pipeline until our changes are merged upstream # Setting that will only affect the edX version of django-pipeline until our changes are merged upstream
PIPELINE_COMPILE_INPLACE = True PIPELINE_COMPILE_INPLACE = True
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"name": "edx", "name": "edx",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"coffee-script": "1.6.1" "coffee-script": "1.6.1",
"uglify-js": "2.4.15"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment