Merge pull request #5521 from edx/will/minify-js

Use UglifyJS to minify JavaScript in the LMS
This commit is contained in:
Will Daly
2014-10-08 12:24:17 -04:00
2 changed files with 4 additions and 3 deletions

View File

@@ -1211,7 +1211,7 @@ if os.path.isdir(DATA_DIR):
PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = "pipeline.compressors.uglifyjs.UglifyJSCompressor"
STATICFILES_IGNORE_PATTERNS = (
"sass/*",
@@ -1222,7 +1222,7 @@ STATICFILES_IGNORE_PATTERNS = (
"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
PIPELINE_COMPILE_INPLACE = True

View File

@@ -2,6 +2,7 @@
"name": "edx",
"version": "0.1.0",
"dependencies": {
"coffee-script": "1.6.1"
"coffee-script": "1.6.1",
"uglify-js": "2.4.15"
}
}