Skip to content

Commit

Permalink
8.9.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
alderg committed Jul 9, 2018
1 parent b939220 commit 9581961
Show file tree
Hide file tree
Showing 16 changed files with 2,860 additions and 2,822 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
09-JUL-2018: 8.9.3

- Fixes rounded style option for containers
- Moves webcola plugin to layout menu
- Fixes minor errors in print preview
- Uses mxGraph 3.9.9 beta 1

06-JUL-2018: 8.9.2

- Enables tags dialog in read-only files
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.9.2
8.9.3
20 changes: 11 additions & 9 deletions etc/mxgraph/mxClient.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/webapp/cache.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CACHE MANIFEST

# THIS FILE WAS GENERATED. DO NOT MODIFY!
# 07/06/2018 02:28 PM
# 07/09/2018 12:12 PM

app.html
index.html?offline=1
Expand Down
1,242 changes: 622 additions & 620 deletions src/main/webapp/js/app.min.js

Large diffs are not rendered by default.

1,152 changes: 577 additions & 575 deletions src/main/webapp/js/atlas-viewer.min.js

Large diffs are not rendered by default.

1,956 changes: 979 additions & 977 deletions src/main/webapp/js/atlas.min.js

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions src/main/webapp/js/diagramly/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ App.main = function(callback, createUi)
if (urlParams['plugins'] != '0' && urlParams['offline'] != '1')
{
var plugins = mxSettings.getPlugins();
var pluginsLoaded = {};
var temp = urlParams['p'];
App.initPluginCallback();

Expand All @@ -506,8 +507,9 @@ App.main = function(callback, createUi)
{
var url = App.pluginRegistry[t[i]];

if (url != null)
if (url != null && pluginsLoaded[url] == null)
{
pluginsLoaded[url] = true;
mxscript(drawDevUrl + url);
}
else if (window.console != null)
Expand Down Expand Up @@ -543,7 +545,11 @@ App.main = function(callback, createUi)
{
try
{
mxscript(plugins[i]);
if (pluginsLoaded[plugins[i]] == null)
{
pluginsLoaded[url] = true;
mxscript(plugins[i]);
}
}
catch (e)
{
Expand Down
61 changes: 50 additions & 11 deletions src/main/webapp/js/diagramly/Editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,11 @@
Editor.s4() + '-' + Editor.s4() + Editor.s4() + Editor.s4();
};

/**
* Whether foreignObjects can be used for math rendering.
*/
Editor.prototype.useForeignObjectForMath = !mxClient.IS_SF;

/**
* Executes the first step for connecting to Google Drive.
*/
Expand Down Expand Up @@ -380,7 +385,7 @@
this.graph.setBackgroundImage(null);
}

mxClient.NO_FO = ((this.graph.mathEnabled && urlParams['math-fo'] != '1') &&
mxClient.NO_FO = ((this.graph.mathEnabled && !this.useForeignObjectForMath) &&
!this.graph.useCssTransforms) ? true : this.originalNoForeignObject;
this.graph.setShadowVisible(node.getAttribute('shadow') == '1', false);
}
Expand Down Expand Up @@ -581,22 +586,15 @@

/**
* Overrides reset graph.
*
* math-fo=1 enables foreignObjects for MathJax.
*
* FIXME:
* - Editor shows no math without page view
* - Lightbox zooming breaks math
*/
var editorResetGraph = Editor.prototype.resetGraph;
Editor.prototype.resetGraph = function()
{
this.graph.mathEnabled = (urlParams['math'] == '1');
this.graph.view.x0 = null;
this.graph.view.y0 = null;
mxClient.NO_FO = ((this.graph.mathEnabled && urlParams['math-fo'] != '1') &&
!this.graph.useCssTransforms) ? true :
this.originalNoForeignObject;
mxClient.NO_FO = ((this.graph.mathEnabled && !this.useForeignObjectForMath) &&
!this.graph.useCssTransforms) ? true : this.originalNoForeignObject;
editorResetGraph.apply(this, arguments);
};

Expand All @@ -607,7 +605,7 @@
Editor.prototype.updateGraphComponents = function()
{
editorUpdateGraphComponents.apply(this, arguments);
mxClient.NO_FO = ((this.graph.mathEnabled && urlParams['math-fo'] != '1') &&
mxClient.NO_FO = ((this.graph.mathEnabled && !this.useForeignObjectForMath) &&
!this.graph.useCssTransforms && Editor.MathJaxRender != null) ? true :
this.originalNoForeignObject;
};
Expand Down Expand Up @@ -1434,6 +1432,46 @@
return graphIsCssTransformsSupported.apply(this, arguments) && !mxClient.IS_SF;
};

/**
* Adds workaround for math rendering in Chrome.
*
* Workaround for https://bugs.webkit.org/show_bug.cgi?id=93358 in WebKit
*
* Adding an absolute position DIV before the SVG seems to mitigate the problem.
*/
var graphViewValidateBackgroundPage = mxGraphView.prototype.validateBackgroundPage;

mxGraphView.prototype.validateBackgroundPage = function()
{
graphViewValidateBackgroundPage.apply(this, arguments);

if (mxClient.IS_GC && this.getDrawPane() != null)
{
var g = this.getDrawPane().parentNode;

if (this.graph.mathEnabled && !mxClient.NO_FO &&
(this.webKitForceRepaintNode == null ||
this.webKitForceRepaintNode.parentNode == null) &&
this.graph.container.firstChild.nodeName == 'svg')
{
this.webKitForceRepaintNode = document.createElement('div');
this.webKitForceRepaintNode.style.cssText = 'position:absolute;';
g.ownerSVGElement.parentNode.insertBefore(this.webKitForceRepaintNode, g.ownerSVGElement);
}
else if (this.webKitForceRepaintNode != null && (!this.graph.mathEnabled ||
(this.graph.container.firstChild.nodeName != 'svg' &&
this.graph.container.firstChild != this.webKitForceRepaintNode)))
{
if (this.webKitForceRepaintNode.parentNode != null)
{
this.webKitForceRepaintNode.parentNode.removeChild(this.webKitForceRepaintNode);
}

this.webKitForceRepaintNode = null;
}
}
};

/**
* Sets default style (used in editor.get/setGraphXml below)
*/
Expand Down Expand Up @@ -2453,6 +2491,7 @@

doc.writeln('<script type="text/x-mathjax-config">');
doc.writeln('MathJax.Hub.Config({');
doc.writeln('showMathMenu: false,');
doc.writeln('messageStyle: "none",');
doc.writeln('jax: ["input/TeX", "input/MathML", "input/AsciiMath", "output/HTML-CSS"],');
doc.writeln('extensions: ["tex2jax.js", "mml2jax.js", "asciimath2jax.js"],');
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/js/diagramly/Minimal.js
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,8 @@ EditorUi.initMinimalTheme = function()
{
this.addMenuItems(menu, (graph.isCellCollapsed(cell)) ? ['expand'] : ['collapse'], null, evt);
}

this.addMenuItems(menu, ['lockUnlock', 'enterGroup'], null, evt);
this.addMenuItems(menu, ['collapsible', '-', 'lockUnlock', 'enterGroup'], null, evt);
menu.addSeparator();
this.addSubmenu('layout', menu);
}
Expand Down
Loading

0 comments on commit 9581961

Please sign in to comment.