From 0674f6371456d0d24c3b05ef43081958c85e0aab Mon Sep 17 00:00:00 2001 From: Gaudenz Alder <gaudenz@jgraph.com> Date: Tue, 21 Apr 2020 13:09:26 +0200 Subject: [PATCH] 13.0.0 release --- src/main/webapp/js/diagramly/Embed.js | 33 ++++++++++++++++++++++----- src/main/webapp/js/embed.dev.js | 33 ++++++++++++++++++++++----- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/js/diagramly/Embed.js b/src/main/webapp/js/diagramly/Embed.js index 4209ebcaf..8323a1ed9 100644 --- a/src/main/webapp/js/diagramly/Embed.js +++ b/src/main/webapp/js/diagramly/Embed.js @@ -70,7 +70,7 @@ var script = document.createElement('script'); script.type = 'text/javascript'; - script.src = 'https://app.diagrams.net/math/MathJax.js?config=TeX-MML-AM_HTMLorMML'; + script.src = 'https://app.diagrams.net/math/MathJax.js'; document.getElementsByTagName('head')[0].appendChild(script); } }; @@ -516,9 +516,9 @@ { if (math == '1') { - mxClient.NO_FO = true; + mxClient.NO_FO = mxClient.IS_SF; } - + var data = (xhr.getText != null) ? xhr.getText() : xhr.responseText; if (data != null) @@ -547,7 +547,7 @@ } } } - + if (newDocument != null && newDocument.documentElement.nodeName == 'svg') { var tmp = newDocument.documentElement.getAttribute('content'); @@ -574,8 +574,29 @@ if (diagrams.length > 0) { - data = Graph.decompress(mxUtils.getTextContent(diagrams[0])); - newDocument = mxUtils.parseXml(data); + var text = mxUtils.trim(mxUtils.getTextContent(diagrams[0])); + var node = null; + + if (text.length > 0) + { + var tmp = Graph.decompress(text); + + if (tmp != null && tmp.length > 0) + { + newDocument = mxUtils.parseXml(tmp); + } + } + else + { + var temp = mxUtils.getChildNodes(diagrams[0]); + + if (temp.length > 0) + { + // Creates new document for unique IDs within mxGraphModel + newDocument = mxUtils.createXmlDocument(); + newDocument.appendChild(newDocument.importNode(temp[0], true)); + } + } } } diff --git a/src/main/webapp/js/embed.dev.js b/src/main/webapp/js/embed.dev.js index a392275cf..627bdf4c6 100644 --- a/src/main/webapp/js/embed.dev.js +++ b/src/main/webapp/js/embed.dev.js @@ -70,7 +70,7 @@ var script = document.createElement('script'); script.type = 'text/javascript'; - script.src = 'https://app.diagrams.net/math/MathJax.js?config=TeX-MML-AM_HTMLorMML'; + script.src = 'https://app.diagrams.net/math/MathJax.js'; document.getElementsByTagName('head')[0].appendChild(script); } }; @@ -516,9 +516,9 @@ { if (math == '1') { - mxClient.NO_FO = true; + mxClient.NO_FO = mxClient.IS_SF; } - + var data = (xhr.getText != null) ? xhr.getText() : xhr.responseText; if (data != null) @@ -547,7 +547,7 @@ } } } - + if (newDocument != null && newDocument.documentElement.nodeName == 'svg') { var tmp = newDocument.documentElement.getAttribute('content'); @@ -574,8 +574,29 @@ if (diagrams.length > 0) { - data = Graph.decompress(mxUtils.getTextContent(diagrams[0])); - newDocument = mxUtils.parseXml(data); + var text = mxUtils.trim(mxUtils.getTextContent(diagrams[0])); + var node = null; + + if (text.length > 0) + { + var tmp = Graph.decompress(text); + + if (tmp != null && tmp.length > 0) + { + newDocument = mxUtils.parseXml(tmp); + } + } + else + { + var temp = mxUtils.getChildNodes(diagrams[0]); + + if (temp.length > 0) + { + // Creates new document for unique IDs within mxGraphModel + newDocument = mxUtils.createXmlDocument(); + newDocument.appendChild(newDocument.importNode(temp[0], true)); + } + } } } -- GitLab