Merge pull request #189 from sharelatex/ho-fine-uploader

moment and fineuploader are loaded separately in editor, not packaged up
This commit is contained in:
Henry Oswald
2017-12-02 13:41:01 +00:00
committed by GitHub
2 changed files with 4 additions and 3 deletions
+2 -2
View File
@@ -30,11 +30,11 @@ clean:
rm -rf $$dir/test/unit/js; \
rm -rf $$dir/test/acceptance/js; \
done
# Deletes node_modules volume
docker-compose down --volumes
# Regenerate docker-shared.yml - not stictly a 'clean',
# but lets `make clean install` work nicely
bin/generate_volumes_file
# Deletes node_modules volume
docker-compose down --volumes
# Need regenerating if you change the web modules you have installed
docker-shared.yml:
+2 -1
View File
@@ -132,7 +132,8 @@ html(itemscope, itemtype='http://schema.org/Product')
// minimal requirejs configuration (can be extended/overridden)
window.requirejs = {
"paths" : {
"moment": "libs/#{lib('moment')}"
"moment": "libs/#{lib('moment')}",
"fineuploader": "libs/#{lib('fineuploader')}"
},
"urlArgs": "fingerprint=#{fingerprint(jsPath + 'main.js')}-#{fingerprint(jsPath + 'libs.js')}",
"config":{