13.7.7 release

daisuke-yoshimoto · Sep 30, 2020 · 9379349 · 9379349
1 parent 71d4042
commit 9379349
Show file tree

Hide file tree

Showing 10 changed files with 286 additions and 258 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+30-SEP-2020: 13.7.7
+
+- Updates Finnish translations, credit Arttu Ylhävuori, github.com/areee
+- Updates native File API tokens
+- Lucidchart import improvements
+- Fixes gradient issues in FF
+- Uses mxGraph 4.2.1 beta 18
+
 28-SEP-2020: 13.7.6
 
 - Updates Azure icons

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-13.7.6
+13.7.7
diff --git a/etc/mxgraph/mxClient.js b/etc/mxgraph/mxClient.js
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -5,10 +5,10 @@
     <title>Flowchart Maker &amp; Online Diagram Software</title>
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <!-- Native File System API V2 token for *.draw.io expires 30 Sep 2020 -->
-    <meta http-equiv="origin-trial" content="AuU3GiQBCw/ECJOOY3aK+ypCG+4mO+R1ywGZHwB/tCGOVhjhGZu+UhZ4/qxWi8i3jic5s2ZPffaY4dd0VQktHwYAAABleyJvcmlnaW4iOiJodHRwczovL2RyYXcuaW86NDQzIiwiZmVhdHVyZSI6Ik5hdGl2ZUZpbGVTeXN0ZW0yIiwiZXhwaXJ5IjoxNjAxNDIzOTk5LCJpc1N1YmRvbWFpbiI6dHJ1ZX0=">
-    <!-- Native File System API V2 token for *.diagrams.net expires 30 Sep 2020 -->
-    <meta http-equiv="origin-trial" content="Aijy4tUQ1cAZ5Db/Sf5MzfHolrKmp4WHAwEnB24RP8WPNq8l4umazuReevn2XsNUtiAPfKRw7ECtF7hVAwjYfgcAAABqeyJvcmlnaW4iOiJodHRwczovL2RpYWdyYW1zLm5ldDo0NDMiLCJmZWF0dXJlIjoiTmF0aXZlRmlsZVN5c3RlbTIiLCJleHBpcnkiOjE2MDE0MjM5OTksImlzU3ViZG9tYWluIjp0cnVlfQ==">
+    <!-- Native File System API V2 token for *.draw.io expires 28 Oct 2020 -->
+    <meta http-equiv="origin-trial" content="Ar7fmwHXVH3qr/+1dFJi3jW0wGPfQVT2J3qip2DlBQmM2wigHhFQaCbjo2hhoYXCCHHmypw3P8rAqMh4kZjhUAUAAABleyJvcmlnaW4iOiJodHRwczovL2RyYXcuaW86NDQzIiwiZmVhdHVyZSI6Ik5hdGl2ZUZpbGVTeXN0ZW0yIiwiZXhwaXJ5IjoxNjAzODQzMTk5LCJpc1N1YmRvbWFpbiI6dHJ1ZX0=">
+    <!-- Native File System API V2 token for *.diagrams.net expires 28 Oct 2020 -->
+    <meta http-equiv="origin-trial" content="AvsXZgeW/PvqJBC1Q3oFnZKGTnqoNdNxikcCEbVkzgMDMAkE+Oj6JjwE57pWlxaYGdhBHHHh1aXiPW9hxJaKYwsAAABqeyJvcmlnaW4iOiJodHRwczovL2RpYWdyYW1zLm5ldDo0NDMiLCJmZWF0dXJlIjoiTmF0aXZlRmlsZVN5c3RlbTIiLCJleHBpcnkiOjE2MDM4NDMxOTksImlzU3ViZG9tYWluIjp0cnVlfQ==">
     <meta name="Description" content="diagrams.net is free online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams">
     <meta name="Keywords" content="diagram, online, flow chart, flowchart maker, uml, erd">
     <meta itemprop="name" content="diagrams.net - free flowchart maker and diagrams online">

diff --git a/src/main/webapp/js/app.min.js b/src/main/webapp/js/app.min.js
diff --git a/src/main/webapp/js/diagramly/Extensions.js b/src/main/webapp/js/diagramly/Extensions.js
@@ -269,7 +269,7 @@ LucidImporter = {};
 			'UMLComponentBlock' : 'shape=component;align=left;spacingLeft=36',
 			'UMLNodeBlock' : 'shape=cube;size=12;flipH=1',
 			'UMLComponentInterfaceBlock' : 'ellipse',
-			'UMLComponentBoxBlock' : cs, //TODO
+			'UMLComponentBoxBlock' : cs,
 //			'UMLAssemblyConnectorBlock' NA
 			'UMLProvidedInterfaceBlock' : 'shape=lollipop;direction=south',
 			'UMLRequiredInterfaceBlock' : 'shape=requires;direction=north',
@@ -3748,7 +3748,13 @@ LucidImporter = {};
 			//'TimelineIntervalBlock' : cs,
 			'MinimalTextBlock' : 'strokeColor=none;fillColor=none',
 //Freehand			
-			'FreehandBlock' : cs
+			'FreehandBlock' : cs,
+//ExtShapes
+			'ExtShapeLaptopBlock': ss + 'citrix.laptop_2;verticalLabelPosition=bottom;verticalAlign=top',
+			'ExtShapeServerBlock': ss + 'citrix.tower_server;verticalLabelPosition=bottom;verticalAlign=top',
+			'ExtShapeCloudBlock': ss + 'citrix.cloud;verticalLabelPosition=bottom;verticalAlign=top',
+			'ExtShapeUserBlock': ss + 'aws3d.end_user;verticalLabelPosition=bottom;verticalAlign=top;fillColor=#073763',
+			'ExtShapeWorkstationLCDBlock': ss + 'veeam.3d.workstation;verticalLabelPosition=bottom;verticalAlign=top'
 	};
 
 	// actual code start
@@ -5210,7 +5216,7 @@ LucidImporter = {};
 
 				addCustomData(cell, p, graph);
 
-				if (p.Title && p.Text)
+				if (p.Title && p.Text && a.Class.substr(0, 8) != 'ExtShape')
 				{
 					var geo = cell.geometry;
 					var title = new mxCell(convertText(p.Title), new mxGeometry(0, geo.height,geo.width, 10), 'strokeColor=none;fillColor=none;');
@@ -8089,6 +8095,14 @@ LucidImporter = {};
 				v.style += addAllStyles(v.style, p, a, v, isLastLblHTML);
 				break;
 			case 'UMLComponentBoxBlock' :
+				v.value = convertText(p);
+				v.style = 'html=1;dropTarget=0;' + addAllStyles(v.style, p, a, v, isLastLblHTML);
+
+				var icon = new mxCell('', new mxGeometry(1, 0, 15, 15), 'shape=component;jettyWidth=8;jettyHeight=4;');
+				icon.geometry.relative = true;
+				icon.geometry.offset = new mxPoint(-20, 5);
+				icon.vertex = true;
+				v.insert(icon);
 				break;
 			case 'BPMNActivity' :
 				v.value = convertText(p.Text);