Merge pull request #708 from sharelatex/jel-mathjax

MathJax - library path, directive, and use `Safe` extension

services/web/app/coffee/infrastructure/ExpressLocals.coffee

@@ -167,6 +167,11 @@ module.exports = (app, webRouter, privateApiRouter, publicApiRouter)->
 			path = Path.join("/img/", imgFile)
 			return Url.resolve(staticFilesBase, path)
 
+		res.locals.mathJaxPath = res.locals.buildJsPath(
+			'libs/mathjax/MathJax.js',
+			{cdn:false, qs:{config:'TeX-AMS_HTML'}}
+		)
+
 		next()
 
 

services/web/app/views/project/editor.pug

@@ -103,6 +103,8 @@ block content
 			h3 {{ title }}
 		.modal-body(ng-bind-html="message")
 
+	script(src=mathJaxPath)
+
 block requirejs
 	script(type="text/javascript" src='/socket.io/socket.io.js')
 
@@ -133,7 +135,6 @@ block requirejs
 		window.wikiEnabled = #{!!(settings.apis.wiki && settings.apis.wiki.url)};
 		window.requirejs = {
 			"paths" : {
-				"mathjax": "#{buildJsPath('/libs/mathjax/MathJax.js', {cdn:false, qs:{config:'TeX-AMS_HTML'}})}",
 				"moment": "libs/#{lib('moment')}",
 				"pdfjs-dist/build/pdf": "libs/#{lib('pdfjs')}/pdf",
 				"pdfjs-dist/build/pdf.worker": "#{pdfWorkerPath}",

services/web/public/coffee/directives/mathjax.coffee

@@ -1,8 +1,8 @@
 define [
 	"base"
-	"mathjax"
 ], (App) ->
 	mathjaxConfig =
+		extensions: ["Safe.js"]
 		messageStyle: "none"
 		imageFont:null
 		"HTML-CSS": { availableFonts: ["TeX"] },

services/web/public/coffee/ide/chat/index.coffee

@@ -2,6 +2,6 @@ define [
 	"ide/chat/controllers/ChatButtonController"
 	"ide/chat/controllers/ChatController"
 	"ide/chat/controllers/ChatMessageController"
-	"ide/chat/directives/mathjax"
+	"directives/mathjax"
 	"filters/wrapLongWords"
 ], () ->