From 15034f6e9f3b9dc2b565bbafc694312dce50881d Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Thu, 4 Oct 2018 16:22:55 +0200
Subject: [PATCH] Mathjax typesetter was separated out

---
 nbdime/webapp/nbdimeserver.py   | 12 ++----------
 packages/webapp/package.json    |  2 +-
 packages/webapp/src/app/diff.ts | 11 +++++++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/nbdime/webapp/nbdimeserver.py b/nbdime/webapp/nbdimeserver.py
index f41f76d0..54ab82af 100644
--- a/nbdime/webapp/nbdimeserver.py
+++ b/nbdime/webapp/nbdimeserver.py
@@ -52,6 +52,8 @@ def base_args(self):
             'closable': self.params.get('closable', False),
             'savable': fn is not None,
             'baseUrl': self.nbdime_base_url,
+            'mathjaxUrl': self.mathjax_url,
+            'mathjaxConfig': self.mathjax_config,
         }
         if fn:
             # For reference, e.g. if user wants to download file
@@ -135,8 +137,6 @@ def get(self):
         args['remote'] = self.get_argument('remote', '')
         self.write(self.render_template('compare.html',
                     config_data=args,
-                    mathjax_url=self.mathjax_url,
-                    mathjax_config=self.mathjax_config,
                    ))
 
 
@@ -148,8 +148,6 @@ def get(self):
 
         self.write(self.render_template('diff.html',
                     config_data=args,
-                    mathjax_url=self.mathjax_url,
-                    mathjax_config=self.mathjax_config,
                    ))
 
 
@@ -172,8 +170,6 @@ def get(self):
             args['remote'] = self.get_argument('remote', '')
         self.write(self.render_template('difftool.html',
                     config_data=args,
-                    mathjax_url=self.mathjax_url,
-                    mathjax_config=self.mathjax_config,
                    ))
 
 
@@ -185,8 +181,6 @@ def get(self):
         args['remote'] = self.get_argument('remote', '')
         self.write(self.render_template('merge.html',
                     config_data=args,
-                    mathjax_url=self.mathjax_url,
-                    mathjax_config=self.mathjax_config,
                    ))
 
 
@@ -203,8 +197,6 @@ def get(self):
             args['remote'] = self.get_argument('remote', '')
         self.write(self.render_template('mergetool.html',
                     config_data=args,
-                    mathjax_url=self.mathjax_url,
-                    mathjax_config=self.mathjax_config,
                    ))
 
 
diff --git a/packages/webapp/package.json b/packages/webapp/package.json
index 75d35fb2..01fa13b0 100644
--- a/packages/webapp/package.json
+++ b/packages/webapp/package.json
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@jupyterlab/application": "^0.18.4",
-    "@jupyterlab/mathjax2-extension": "^0.6.4",
+    "@jupyterlab/mathjax2": "^0.7.1",
     "@jupyterlab/apputils": "^0.18.4",
     "@jupyterlab/cells": "^0.18.4",
     "@jupyterlab/codemirror": "^0.18.4",
diff --git a/packages/webapp/src/app/diff.ts b/packages/webapp/src/app/diff.ts
index a59ccd8b..2804165c 100644
--- a/packages/webapp/src/app/diff.ts
+++ b/packages/webapp/src/app/diff.ts
@@ -19,9 +19,13 @@ import {
   defaultSanitizer
 } from '@jupyterlab/apputils';
 
+import {
+  PageConfig
+} from '@jupyterlab/coreutils';
+
 import {
   MathJaxTypesetter
-} from '@jupyterlab/mathjax2-extension';
+} from '@jupyterlab/mathjax2';
 
 import {
   IDiffEntry
@@ -84,7 +88,10 @@ function showDiff(data: {base: nbformat.INotebookContent, diff: IDiffEntry[]}):
   let rendermime = new RenderMimeRegistry({
     initialFactories: rendererFactories,
     sanitizer: defaultSanitizer,
-    latexTypesetter: new MathJaxTypesetter(),
+    latexTypesetter: new MathJaxTypesetter({
+      url: getConfigOption('mathjaxUrl'),
+      config: getConfigOption('mathjaxConfig'),
+    }),
   });
 
   let nbdModel = new NotebookDiffModel(data.base, data.diff);