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

Instead of loading script directly use requirejs config so it can be lazy loaded

Alasdair Smith 8 лет назад
Родитель
Сommit
5e2f838af4

+ 2 - 0
services/web/app/coffee/infrastructure/ExpressLocals.coffee

@@ -150,6 +150,8 @@ module.exports = (app, webRouter, privateApiRouter, publicApiRouter)->
 		res.locals.buildWebpackPath = (jsFile, opts = {}) ->
 			if Settings.webpack? and !Settings.useMinifiedJs
 				path = Path.join(jsPath, jsFile)
+				if opts.removeExtension == true
+					path = path.slice(0,-3)
 				return "#{Settings.webpack.url}/public#{path}"
 			else
 				return res.locals.buildJsPath(jsFile, opts)

+ 1 - 2
services/web/app/views/project/editor.pug

@@ -133,6 +133,7 @@ block requirejs
 				"fineuploader": "libs/#{lib('fineuploader')}",
 				"ide": "#{buildJsPath('ide.js', {hashedPath:settings.useMinifiedJs, removeExtension:true})}",
 				"libraries": "#{buildJsPath('libraries.js', {hashedPath:settings.useMinifiedJs, removeExtension:true})}",
+				!{moduleIncludes("editor:script", locals)}
 			},
 			"waitSeconds": 0,
 			"shim": {
@@ -159,8 +160,6 @@ block requirejs
 		window.pdfCMapsPath = "#{pdfCMapsPath}"
 		window.uiConfig = JSON.parse('!{JSON.stringify(uiConfig).replace(/\//g, "\\/")}');
 
-	!= moduleIncludes("editor:script", locals)
-
 	script(
 		data-main=buildJsPath("ide.js", {hashedPath:false}),
 		baseurl=fullJsPath,