Merge pull request #544 from edx/will/minimize-should-be-minify

Clarify naming of Javascript minify task

Makefile

@@ -32,7 +32,7 @@ install-nltk-data:
 
 STATIC_JS = openassessment/xblock/static/js
 
-minimize-js: install-js
+javascript:
 	node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js > "$(STATIC_JS)/openassessment.min.js"
 
 
@@ -40,7 +40,7 @@ install-test:
 	pip install -q -r requirements/test.txt
 
 
-install: install-system install-node install-wheels install-python install-js install-nltk-data install-test minimize-js
+install: install-system install-node install-wheels install-python install-js install-nltk-data install-test javascript
 
 test:
 	./scripts/test.sh

README.rst

@@ -47,7 +47,7 @@ to start the server on port 8001:
     ./scripts/workbench.sh 8001
 
 
-Combining and Minimizing JavaScript and Sass
+Combining and Minifying JavaScript and Sass
 ============================================
 
 To reduce page size, the OpenAssessment XBlock serves combined/minified
@@ -60,7 +60,7 @@ files:
 .. code:: bash
 
     # Combine/minify JavaScript
-    make minimize-js
+    make javascript
 
     # Combine/minify CSS (from Sass)
     ./scripts/sass.sh

scripts/workbench.sh

@@ -6,7 +6,7 @@ cd `dirname $BASH_SOURCE` && cd ..
 # Install dependencies
 make install-python
 make install-js
-make minimize-js
+make javascript
 
 # Configure Django settings
 export DJANGO_SETTINGS_MODULE="settings.dev"