6.1.2 release

ChangeLog

@@ -1,3 +1,8 @@
+17-FEB-2017: 6.1.2
+
+- Uses semantic versioning
+- Fixes possible NPE in format panel
+
 16-FEB-2017: 6.1.1.0
 
 - Uses mxGraph 3.7.0.2 beta 4

VERSION

@@ -1 +1 @@
-6.1.1.0
+6.1.2

war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 02/16/2017 06:04 PM
+# 02/17/2017 07:08 AM
 
 app.html
 index.html?offline=1

war/js/mxgraph/Format.js

@@ -1418,8 +1418,12 @@ ArrangePanel.prototype.init = function()
 	// Special case that adds two panels
 	this.addGeometry(this.container);
 	this.addEdgeGeometry(this.container);
-	this.container.appendChild(this.addAngle(this.createPanel()));
 
+	if (!ss.containsLabel || ss.edges.length == 0)
+	{
+		this.container.appendChild(this.addAngle(this.createPanel()));
+	}
+	
 	if (!ss.containsLabel && ss.edges.length == 0)
 	{
 		this.container.appendChild(this.addFlip(this.createPanel()));
@@ -1720,13 +1724,14 @@ ArrangePanel.prototype.addAngle = function(div)
 	
 	var input = null;
 	var update = null;
+	var btn = null;
 	
 	if (ss.edges.length == 0)
 	{
 		mxUtils.write(span, mxResources.get('angle'));
 		div.appendChild(span);
 		
-		input = this.addUnitInput(div, '°', 84, 44, function()
+		input = this.addUnitInput(div, '°', (!ss.containsLabel) ? 84 : 20, 44, function()
 		{
 			update.apply(this, arguments);
 		});
@@ -1734,7 +1739,7 @@ ArrangePanel.prototype.addAngle = function(div)
 
 	if (!ss.containsLabel)
 	{
-		var btn = mxUtils.button(mxResources.get('turn'), function(evt)
+		btn = mxUtils.button(mxResources.get('turn'), function(evt)
 		{
 			ui.actions.get('turn').funct();
 		})
@@ -1749,8 +1754,11 @@ ArrangePanel.prototype.addAngle = function(div)
 	
 	if (input == null)
 	{
-		btn.style.right = '';
-		btn.style.width = '202px';
+		if (btn != null)
+		{
+			btn.style.right = '';
+			btn.style.width = '202px';
+		}
 	}
 	else
 	{