7.9.7 release

ChangeLog

@@ -1,3 +1,13 @@
+12-JAN-2018: 7.9.7
+
+- Disables http/https redirects
+
+12-JAN-2018: 7.9.6
+
+- Gliffy import improvements
+- Adds fontCss configuration to SVG export
+- Uses mxGraph 3.8.1 beta 10
+
 04-JAN-2018: 7.9.5
 
 - Fixes bug with current desktop app launcher

VERSION

@@ -1 +1 @@
-7.9.5
+7.9.7

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

@@ -507,7 +507,7 @@ public class GliffyDiagramConverter
 			cell.setVertex(true);
 			style.append(StencilTranslator.translate(gliffyObject.uid, null)).append(";");
 
-			if(gliffyObject.rotation == 0) //270 case is handled in rotation below
+			if (gliffyObject.rotation == 0) //270 case is handled in rotation below
 			{
 				style.append("childLayout=stackLayout;resizeParent=1;resizeParentMax=0;");
 			}
@@ -540,17 +540,22 @@ public class GliffyDiagramConverter
 				
 				if(gliffyObject.rotation != 0) 
 				{
+					
 					if (gliffyObject.rotation == 270) //Special handling for this common case
 					{
 						laneStyle.append("horizontal=0;");
 						double width = childGeometry.getWidth();
 						childGeometry.setWidth(childGeometry.getHeight());
 						childGeometry.setHeight(width);
+						double x = childGeometry.getX();
+						childGeometry.setX(childGeometry.getY());
+						childGeometry.setY(gliffyObject.width - width - x);
 					}
 					else
 					{
 						laneStyle.append("rotation=" + gliffyObject.rotation).append(";");
 						Utils.rotatedGeometry(childGeometry, gliffyObject.rotation, gliffyObject.width/ 2, gliffyObject.height / 2);
+
 					}
 				}
 
@@ -593,10 +598,11 @@ public class GliffyDiagramConverter
 		if (!gliffyObject.isLine())
 		{
 			//if there's a rotation by default, add to it
-			if(style.lastIndexOf("rotation") != -1) 
+			if (style.lastIndexOf("rotation") != -1) 
 			{
 				Matcher m = rotationPattern.matcher(style);
-				if(m.find())
+				
+				if (m.find())
 				{
 					String rot = m.group(1);
 					float initialRotation = Float.parseFloat(rot);
@@ -607,7 +613,7 @@ public class GliffyDiagramConverter
 
 					//handles a specific case where draw.io triangle needs to have an initial rotation of -90 to match that of Gliffy
 					//in this case, width and height are swapped and x and y are updated
-					if(style.lastIndexOf("swapwidthandheight") != -1) 
+					if (style.lastIndexOf("swapwidthandheight") != -1) 
 					{
 						geometry.setX(geometry.getX() + (geometry.getWidth() - geometry.getHeight()) / 2);
 						geometry.setY(geometry.getY() + + (geometry.getHeight() - geometry.getWidth()) / 2);
@@ -619,7 +625,7 @@ public class GliffyDiagramConverter
 					}
 				}
 			}
-			else if(gliffyObject.rotation != 0)
+			else if (gliffyObject.rotation != 0)
 			{
 				//handling the special common case
 				if (style.indexOf("swimlane;") > -1 && gliffyObject.rotation == 270) {

war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 01/04/2018 10:49 PM
+# 01/12/2018 11:30 PM
 
 app.html
 index.html?offline=1

war/index.html

@@ -91,22 +91,6 @@
 						host = 'www.draw.io';
 					}
 					
-					// Redirects to SSL/non-SSL
-					if (urlParams['demo'] != '1')
-					{
-						var ssl = (urlParams['https'] != null) ? urlParams['https'] == '1' :
-							navigator.userAgent.indexOf('MSIE') < 0 || document.documentMode >= 9;
-						
-						if (ssl && proto != 'https:')
-						{
-							proto = 'https:';
-						}
-						else if (!ssl && proto != 'http:')
-						{
-							proto = 'http:';
-						}
-					}
-					
 					var href = proto + '//' + host + window.location.href.substring(
 							window.location.protocol.length +
 							window.location.host.length + 2);

war/js/diagramly/EditorUi.js

@@ -3177,6 +3177,16 @@
 					svgRoot.setAttribute('content', this.getFileData(true, null, null, null, ignoreSelection, currentPage));
 				}
 				
+				if (this.editor.fontCss != null)
+				{
+					var svgDoc = svgRoot.ownerDocument;
+					var style = (svgDoc.createElementNS != null) ?
+							svgDoc.createElementNS(mxConstants.NS_SVG, 'style') : svgDoc.createElement('style');
+					style.setAttribute('type', 'text/css');
+					mxUtils.setTextContent(style, this.editor.fontCss);
+					svgRoot.getElementsByTagName('defs')[0].appendChild(style);
+				}
+				
 				var svg = '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n' +
 					mxUtils.getXml(svgRoot);
 				

war/js/diagramly/vsdx/mxVsdxCanvas2D.js

@@ -858,7 +858,7 @@ mxVsdxCanvas2D.prototype.text = function(x, y, w, h, str, align, valign, wrap, f
 		this.shape.appendChild(this.createCellElemScaled("TxtLocPinY", hh + hShift));
 
 		if (rotation != 0)
-			this.shape.appendChild(this.createCellElemScaled("TxtAngle", (360 - rotation) * Math.PI / 180));
+			this.shape.appendChild(this.createCellElem("TxtAngle", (360 - rotation) * Math.PI / 180));