10.7.9 release

ChangeLog

@@ -1,3 +1,7 @@
+19-JUN-2019: 10.7.9
+
+- Ignores refs and manage columns in CSV example
+
 19-JUN-2019: 10.7.8
 
 - Fixes double click handling with pen and touch on Windows

VERSION

@@ -1 +1 @@
-10.7.8
+10.7.9

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

@@ -629,6 +629,8 @@ public class GliffyDiagramConverter
 				GliffyShape shape = graphic.Shape;
 
 				cell.setVertex(true);
+				
+				boolean isChevron = gliffyObject.uid != null && gliffyObject.uid.contains("chevron");
 
 				if (translatedStyle != null)
 				{
@@ -644,7 +646,7 @@ public class GliffyDiagramConverter
 				{
 					style.append("strokeWidth=" + shape.strokeWidth).append(";");
 
-					if (shape.strokeWidth == 0)
+					if (shape.strokeWidth == 0 && !isChevron)
 					{
 						style.append("strokeColor=none;");
 					}
@@ -652,7 +654,7 @@ public class GliffyDiagramConverter
 
 				if (style.lastIndexOf("fillColor") == -1)
 				{
-					if (shape.isNoFill())
+					if (shape.isNoFill() && !isChevron)
 					{
 						style.append("fillColor=none;");
 
@@ -986,7 +988,8 @@ public class GliffyDiagramConverter
 				}
 				else
 				{
-					style.append(textObject == gliffyObject ? txt.getStyle(0, 0) : txt.getStyle(textObject.x, textObject.y));
+					boolean isChevron = gliffyObject.uid != null && gliffyObject.uid.contains("chevron");
+					style.append(textObject == gliffyObject || isChevron ? txt.getStyle(0, 0) : txt.getStyle(textObject.x, textObject.y));
 				}
 			}
 		}

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

@@ -291,7 +291,7 @@ public class GliffyObject implements PostDeserializable
 	public String getText()
 	{
 		GliffyText text = graphic.getText();
-		//TODO These values are hurestics based on analyzing many files. 6 is a range from 2 to 6 so used the maximum
+		//TODO These values are heuristics based on analyzing many files. 6 is a range from 2 to 6 so used the maximum
 		int widthDiff = "none".equals(text.overflow)? -3 : 6;
 		return "<div style='width: "+ (width + widthDiff) +"px;height: "+ height +"px;word-break: break-word;'>" + text.getHtml() + "</div>";
 	}

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 06/19/2019 01:14 PM
+# 06/19/2019 04:57 PM
 
 app.html
 index.html?offline=1

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

@@ -281,7 +281,7 @@
 		'## Comma-separated list of ignored columns for metadata. (These can be\n' +
 		'## used for connections and styles but will not be added as metadata.)\n' +
 		'#\n' +
-		'# ignore: id,image,fill,stroke\n' +
+		'# ignore: id,image,fill,stroke,refs,manager\n' +
 		'#\n' +
 		'## Column to be renamed to link attribute (used as link).\n' +
 		'#\n' +

src/main/webapp/js/diagramly/Extensions.js

@@ -4229,7 +4229,7 @@ LucidImporter = {};
 		{
 			addPages(JSON.parse(state.state));
 		}
-		else if (state.Pages != null)
+		else if (state.Page == null && state.Pages != null)
 		{
 			addPages(state);
 		}

src/main/webapp/js/mxgraph/Dialogs.js

@@ -1506,12 +1506,11 @@ var EditDataDialog = function(ui, cell)
 
 	if (id != null)
 	{	
-		var text = document.createElement('input');
-		text.style.width = '420px';
+		var text = document.createElement('div');
+		text.style.width = '100%';
+		text.style.fontSize = '11px';
 		text.style.textAlign = 'center';
-		text.setAttribute('type', 'text');
-		text.setAttribute('readOnly', 'true');
-		text.setAttribute('value', id);
+		mxUtils.write(text, id);
 		
 		form.addField(mxResources.get('id') + ':', text);
 	}

src/main/webapp/js/mxgraph/Graph.js

@@ -5636,7 +5636,7 @@ if (typeof mxVertexHandler != 'undefined')
 				value.setAttribute('label', cell.value || '');
 			}
 			
-			if (attributeValue != null && attributeValue.length > 0)
+			if (attributeValue != null)
 			{
 				value.setAttribute(attributeName, attributeValue);
 			}