8.9.5 release

ChangeLog

@@ -1,3 +1,9 @@
+13-JUL-2018: 8.9.5
+
+- Fixes clipping for MathJax print preview in Safari
+- Uses mxGraph 3.9.9 beta 3
+- Fixes minor memory leak
+
 11-JUL-2018: 8.9.4
 
 - Removes foreignObjects for MathJax

VERSION

@@ -1 +1 @@
-8.9.4
+8.9.5

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 07/11/2018 02:40 PM
+# 07/13/2018 05:41 PM
 
 app.html
 index.html?offline=1

src/main/webapp/js/diagramly/Editor.js

@@ -2363,11 +2363,17 @@
 						
 						pv.renderPage = function(w, h, dx, dy, content, pageNumber)
 						{
+							var prev = mxClient.NO_FO;
+							mxClient.NO_FO = (this.graph.mathEnabled && !this.useForeignObjectForMath) ?
+									true : this.originalNoForeignObject;
+							
 							var result = printPreviewRenderPage.apply(this, arguments);
+
+							mxClient.NO_FO = prev;
 							
 							if (this.graph.mathEnabled)
 							{
-								this.mathEnabled = true;
+								this.mathEnabled = this.mathEnabled || true;
 							}
 							else
 							{

src/main/webapp/js/mxgraph/Sidebar.js

@@ -2089,6 +2089,10 @@ Sidebar.prototype.createDropHandler = function(cells, allowSplit, allowCellsInse
 							graph.fireEvent(new mxEventObject('cellsInserted', 'cells', select));
 						}
 					}
+					catch (e)
+					{
+						this.editorUi.handleError(e);
+					}
 					finally
 					{
 						graph.model.endUpdate();
@@ -2244,6 +2248,10 @@ Sidebar.prototype.dropAndConnect = function(source, targets, direction, dropCell
 			
 			graph.fireEvent(new mxEventObject('cellsInserted', 'cells', targets));
 		}
+		catch (e)
+		{
+			this.editorUi.handleError(e);
+		}
 		finally
 		{
 			graph.model.endUpdate();

src/main/webapp/plugins/webcola/mxWebColaAdaptor.js

@@ -28,7 +28,7 @@ var doNothing = function()
 
 function mxWebColaAdaptor(graph, dimension, movableVertices, options)
 /**
- * Conatructs a WebCola adaptor for mxGraph
+ * Constructs a WebCola adaptor for mxGraph
  * @param graph mxGraph instance
  * @param dimension array containing [width, height] of drawing canvas in points
  * @param movableVertices set containing IDs of vertices that are movable; if undefined all vertices are movable
@@ -42,6 +42,11 @@ function mxWebColaAdaptor(graph, dimension, movableVertices, options)
   {
     this.dimension = [600, 600];
   }
+  // compute vertex/group degrees from incidence
+  this.vertexDegrees = new mxDictionary();
+  this.groupDegrees = new mxDictionary();
+  this.computeVertexDegrees();
+  // convert draw.io graph to WebCola's nodes/links
   var layoutResult = this.graphToLayout(graph, movableVertices);
   this.nodes = layoutResult.nodes;
   this.links = layoutResult.links;
@@ -491,6 +496,14 @@ mxWebColaAdaptor.prototype.graphToLayout = function(graph, movableVertices)
 };
 
 mxWebColaAdaptor.prototype.createLink = function(sourceId, targetId, cellIds)
+/**
+ * Creates a default version of a WebCola link/edge
+ * @param sourceId ID of the edge's source vertex cell
+ * @param targetId ID of the edge's target vertex cell
+ * @param cellIds cell ID to WebCola's node ID mapping
+ * @returns a WebCola link corresponding to the edge [sourceId, targetId] 
+ * in WebCola node IDs
+ */
 {
   var link = {};
   link.source = cellIds[sourceId];
@@ -500,6 +513,111 @@ mxWebColaAdaptor.prototype.createLink = function(sourceId, targetId, cellIds)
   return link;
 }
 
+mxWebColaAdaptor.prototype.computeVertexDegrees = function()
+/**
+ * Computes group vertex and vertex degrees. Useful to stop layouting for groups
+ * with no internal, incoming or outgoing edges.
+ */
+{
+  var model = this.graph.getModel();
+  var cells = model.cells;
+  
+  // compute individual vertex degrees
+  for (var id in cells)
+  {
+    var cell = cells[id];
+    if (cell.isEdge())
+    {
+    	  // scan all edges, ignore other types
+    	  var sourceId = cell.source.id;
+    	  var targetId = cell.target.id;
+    	  var source = cells[sourceId];
+    	  var target = cells[targetId];
+    	  
+    	  if (sourceId == targetId)
+      {
+    		 // self-loops are irrelevant
+         continue;    		  
+    	  }
+    	  
+    	  var sourceDegree = this.vertexDegrees.get(source);
+    	  if (typeof sourceDegree == "undefined")
+      {
+    		sourceDegree = 0;
+      }
+    	  sourceDegree++;
+    	  this.vertexDegrees.put(source, sourceDegree);
+
+    	  var targetDegree = this.vertexDegrees.get(target);
+    	  if (typeof targetDegree == "undefined")
+      {
+    		  targetDegree = 0;
+      }
+    	  targetDegree++;
+    	  this.vertexDegrees.put(target, targetDegree);
+    }
+  }
+  // compute sub-group degree, i.e. sum of all degrees of children
+  // algorithm goes through all vertices, then for each vertex it goes on its material
+  // path to root and adds its contribution to all vertices on this path
+  // this should for each vertex place exactly the sum of degrees of all its vertices
+  // and itself, nothing less, nothing more
+  for (var id in cells)
+  {
+    var cell = cells[id];
+    if (cell.isVertex())
+    {
+    	  // scan all vertices, ignore other types
+    	  var vertexDegree = this.vertexDegrees.get(cell);
+    	  if (typeof vertexDegree == "undefined")
+    	  {
+    		vertexDegree = 0;
+    	  }
+      var parent = cell;
+    	  while (parent != null && typeof parent != "undefined")
+	  {
+	    	var groupDegree = this.groupDegrees.get(parent);
+	    	if (typeof groupDegree == "undefined")
+	    	{
+	      groupDegree = 0;
+	    }
+	    groupDegree += vertexDegree;
+        this.groupDegrees.put(parent, groupDegree);
+        parent = parent.parent;
+      }
+    }
+  }
+}
+
+mxWebColaAdaptor.prototype.isZeroConnected = function(groupCell)
+/**
+ * Indicates if all group cell's vertices have no incidental edges
+ * @params groupCell group cell
+ * @returns true if the group cell doesn't contain any vertices with edges
+ */
+{
+  var groupDegree = this.groupDegrees.get(groupCell);
+  console.log("Group " + groupCell.id + " degree: " + groupDegree);
+  if (typeof groupDegree != "undefined" && groupDegree > 0)
+  {
+	return false;
+  }
+  return true;
+}
+
+mxWebColaAdaptor.prototype.isInZeroConnectedGroup = function(cell)
+{
+  var parent = cell.parent;
+  if (parent == null || typeof parent == "undefined")
+  {
+	return this.isZeroConnected(cell);
+  }
+  else
+  {
+	return this.isZeroConnected(parent);
+  }
+}
+
 mxWebColaAdaptor.prototype.isLeafOrCollapsed = function(cell)
   /**
    * Returns true if a cell is either a leaf or a collapsed group
@@ -513,6 +631,17 @@ mxWebColaAdaptor.prototype.isLeafOrCollapsed = function(cell)
   {
     return true;
   }
+  if (this.isZeroConnected(cell))
+  {
+	return true;
+  }
+  /*
+  if (!cell.isCollapsed() && cell.children != null && cell.children.length > 0 && this.graph.getEdges(cell, null, true, true, true, true).length == 0)
+  {
+	console.log("cell " + cell.id + " is 0-connected.");
+	return true;
+  }
+  */
   return false;
 }
 

src/main/webapp/plugins/webcola/mxWebColaLayout.js

@@ -309,7 +309,14 @@ mxWebColaLayout.prototype.updateGraph = function(isUndoable = false, initial = f
             
     	        if (model.isVertex(cell))
     	        {
-   		      geometry.offset = null;
+  	        	  if (this.layout.isInZeroConnectedGroup(cell))
+	        	  {
+	        		geometry.offset = geometry.offset.clone();
+	        	  }
+	        	  else
+	          {
+		        geometry.offset = null;
+	          }
     	        }
           }
           
@@ -361,7 +368,14 @@ mxWebColaLayout.prototype.updateGraph = function(isUndoable = false, initial = f
             
     	        if (model.isVertex(cell))
     	        {
-   		      geometry.offset = null;
+    	        	  if (this.layout.isInZeroConnectedGroup(cell))
+    	        	  {
+    	        		geometry.offset = geometry.offset.clone();
+    	        	  }
+    	        	  else
+    	          {
+   		        geometry.offset = null;
+    	          }
     	        }
           }
         	  if (isUndoable)