10.5.5 release

ChangeLog

@@ -1,3 +1,8 @@
+25-MAR-2019: 10.5.5
+
+- Improvements for Gliffy import
+- Uses mxGraph 4.0.1 beta 3
+
 22-MAR-2019: 10.5.4
 
 - Adds custom libraries for Confluence cloud

VERSION

@@ -1 +1 @@
-10.5.4
+10.5.5

src/main/java/com/mxgraph/io/gliffy/importer/GliffyDiagramConverter.java

@@ -347,7 +347,7 @@ public class GliffyDiagramConverter
 				temp = mxUtils.getRotatedPoint(temp, Math.cos(rad), Math.sin(rad), new mxPoint(0.5, 0.5));
 			}
 
-			if (!orthogonal || (temp.getX() == 0.5 && temp.getY() == 0.5))
+			if (!orthogonal || (temp.getX() == 0.5 && temp.getY() == 0.5) || GliffyObject.FORCE_CONSTRAINTS_SHAPES.contains(object.uid))
 			{
 				mxCell cell = object.getMxObject();
 				cell.setStyle(cell.getStyle() + ((source) ? "exitX=" : "entryX=") + temp.getX() + ";" + ((source) ? "exitY=" : "entryY=")

src/main/java/com/mxgraph/io/gliffy/model/GliffyObject.java

@@ -28,6 +28,8 @@ public class GliffyObject implements PostDeserializable
 	
 	private static Set<String> FILLCLR_IS_STROKECLR_SHAPES = new HashSet<>();
 	
+	public static Set<String> FORCE_CONSTRAINTS_SHAPES = new HashSet<String>();
+	
 	private static Map<String, double[]> SHAPES_COORD_FIX = new HashMap<>();
 
 	public float x;
@@ -201,6 +203,8 @@ public class GliffyObject implements PostDeserializable
 		MINDMAP_SHAPES.add("com.gliffy.shape.mindmap.mindmap_v1.default.main_topic");
 		MINDMAP_SHAPES.add("com.gliffy.shape.mindmap.mindmap_v1.default.subtopic");
 		MINDMAP_SHAPES.add("com.gliffy.shape.mindmap.mindmap_v1.default.child_node");
+		
+		FORCE_CONSTRAINTS_SHAPES.add("com.gliffy.shape.uml.uml_v2.class.association");
 
 		//This map is used to change Gliffy coordinates to match mxGraph ones
 		//Format [xShift, yShift, widthShift, heightShift, DONT REPOSITION TEXT] values between ]-1, 1[ means percentage

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 03/22/2019 05:12 PM
+# 03/25/2019 07:06 AM
 
 app.html
 index.html?offline=1

src/main/webapp/js/diagramly/App.js

@@ -75,26 +75,6 @@ App = function(editor, container, lightbox)
 		}
 	});
 
-	// Handles cloning errors when copying cells
-	var clipboardCopy = mxClipboard.copy;
-	var self = this;
-	
-	mxClipboard.copy = function(graph, cells)
-	{
-		var result = null;
-		
-		try
-		{
-			result = clipboardCopy.apply(this, arguments);
-		}
-		catch (e)
-		{
-			self.handleError(e);
-		}
-		
-		return result;
-	},
-
 	// Initial state for toolbar items is disabled
 	this.updateDocumentTitle();
 	this.updateUi();

src/main/webapp/js/diagramly/DrawioFileSync.js

@@ -950,8 +950,8 @@ DrawioFileSync.prototype.merge = function(patches, checksum, desc, success, erro
 					var uid = (user != null) ? user.id : 'unknown';
 
 					EditorUi.logEvent({category: 'PATCH-SYNC-FILE-' + this.file.getHash(),
-						action: uid + '-recvd-' + this.file.stats.bytesReceived + '-msgs-' +
-						this.file.stats.msgReceived,
+						action: uid + '-patches-' + patches.length + '-recvd-' +
+						this.file.stats.bytesReceived + '-msgs-' + this.file.stats.msgReceived,
 						label: this.clientId});
 				}
 				catch (e)

src/main/webapp/js/diagramly/EditorUi.js

@@ -8418,9 +8418,16 @@
 			{
 				if (graph.isEnabled())
 				{
-					mxClipboard.copy(graph);
-					this.copyCells(textInput);
-					clearInput();
+					try
+					{
+						mxClipboard.copy(graph);
+						this.copyCells(textInput);
+						clearInput();
+					}
+					catch (e)
+					{
+						this.handleError(e);
+					}
 				}
 			}));
 			
@@ -8428,9 +8435,16 @@
 			{
 				if (graph.isEnabled())
 				{
-					mxClipboard.copy(graph);
-					this.copyCells(textInput, true);
-					clearInput();
+					try
+					{
+						mxClipboard.copy(graph);
+						this.copyCells(textInput, true);
+						clearInput();
+					}
+					catch (e)
+					{
+						this.handleError(e);
+					}
 				}
 			}));