Просмотр исходного кода

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

moment and fineuploader are loaded separately in editor, not packaged up
Henry Oswald 8 лет назад
Родитель
Сommit
b38cf9ef6e
2 измененных файлов с 4 добавлено и 3 удалено
  1. 2 2
      services/web/Makefile
  2. 2 1
      services/web/app/views/layout.pug

+ 2 - 2
services/web/Makefile

@@ -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
services/web/app/views/layout.pug

@@ -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":{