From 04a5bd8cd2941dfbd90f8c2f7e18932fc5896de7 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Thu, 15 Dec 2016 16:12:35 +0300
Subject: [PATCH] PY-21447 Jupyter Notebook fails to properly handle
 IPython.display Markdown

load remote mathjax because it can't resolve it's dependencies inside jar
---
 python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbJfxUtils.java | 5 ++---
 .../src/org/jetbrains/plugins/ipnb/format/IpnbParser.java    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbJfxUtils.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbJfxUtils.java
index 7cbd6f1d2248..c9cda9fee348 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbJfxUtils.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbJfxUtils.java
@@ -60,9 +60,7 @@ public class IpnbJfxUtils {
                                                  "                }\n" +
                                                  "            });\n" +
                                                  "</script><script type=\"text/javascript\"\n" +
-                                                 " src=\"" +
-                                                 IpnbFileType.class.getResource("/MathJax/MathJax.js") +
-                                                 "?config=TeX-AMS_HTML-full\">\n" +
+                                                 " src=\"http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML-full\">\n" +
                                                  " </script>" + ourBody;
   private static final String ourPrefix = ourStyle + ourBody;
   private static final String ourPostfix = "</div></body></html>";
@@ -102,6 +100,7 @@ public class IpnbJfxUtils {
       final BorderPane pane = new BorderPane(webView);
       final String prefix;
       if (hasMath) {
+
         prefix = String.format(ourMathJaxPrefix, width - 500, EditorColorsManager.getInstance().getGlobalScheme().getEditorFontSize());
       }
       else {
diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java
index 468a65a906a7..c2457bdafb6c 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/format/IpnbParser.java
@@ -361,7 +361,7 @@ public class IpnbParser {
           }
           raw.data = dataRaw;
           raw.execution_count = outputCell.getPromptNumber();
-          raw.output_type = "execute_result";
+          raw.output_type = outputCell.getPromptNumber() != null ? "execute_result" : "display_data";
         }
         else {
           raw.latex = ((IpnbLatexOutputCell)outputCell).getLatex();