7.1.2 release

Former-commit-id: 9e6fda708db103ad1a19f360515fcd6e1ec7bae5

ChangeLog

@@ -1,3 +1,7 @@
+16-AUG-2017: 7.1.2
+
+- Fixes possible NPE in mxShapeBasicRectCallout shape
+
 16-AUG-2017: 7.1.1
 
 - Disables drafts in Confluence Cloud add-on

VERSION

@@ -1 +1 @@
-7.1.1
+7.1.2

war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 08/16/2017 08:32 AM
+# 08/16/2017 09:46 AM
 
 app.html
 index.html?offline=1

war/js/mxgraph/Shapes.js

@@ -1395,7 +1395,8 @@
 	{
 		return mxPerimeter.RectanglePerimeter(mxUtils.getDirectedBounds(bounds, new mxRectangle(0, 0, 0,
 			Math.max(0, Math.min(bounds.height, parseFloat(mxUtils.getValue(vertex.style, 'size',
-			CalloutShape.prototype.size))))), vertex.style), vertex, next, orthogonal);
+			CalloutShape.prototype.size)) * vertex.view.scale))),
+			vertex.style), vertex, next, orthogonal);
 	};
 	
 	mxStyleRegistry.putValue('calloutPerimeter', mxPerimeter.CalloutPerimeter);
@@ -3542,6 +3543,7 @@
 	// Defines connection points for all shapes
 	IsoRectangleShape.prototype.constraints = [];
 	IsoCubeShape.prototype.constraints = [];
+	CalloutShape.prototype.constraints = [];
 	mxRectangleShape.prototype.constraints = [new mxConnectionConstraint(new mxPoint(0.25, 0), true),
 	                                          new mxConnectionConstraint(new mxPoint(0.5, 0), true),
 	                                          new mxConnectionConstraint(new mxPoint(0.75, 0), true),

war/shapes/mxBasic.js

@@ -127,7 +127,7 @@ mxShapeBasicRectCallout.prototype.getLabelMargins = function()
 		return new mxRectangle(0, 0, 0, parseFloat(mxUtils.getValue(this.style, 'dy', this.dy)) * this.scale);
 	}
 	
-	return new mxRectangle(rect.x, rect.y, rect.width, rect.height);
+	return null;
 };
 
 mxCellRenderer.registerShape(mxShapeBasicRectCallout.prototype.cst.RECT_CALLOUT, mxShapeBasicRectCallout);
@@ -242,8 +242,6 @@ Graph.handleFactory[mxShapeBasicRoundRectCallout.prototype.cst.ROUND_RECT_CALLOU
 	})];
 };
 
-mxShapeBasicRoundRectCallout.prototype.getLabelBounds = mxShapeBasicRectCallout.prototype.getLabelBounds;
-
 //**********************************************************************************************************************************************************
 // Wave
 //**********************************************************************************************************************************************************