7.2.9 release

dannyraines · Aug 25, 2017 · 655827b · 655827b
1 parent e45939f
commit 655827b
Show file tree

Hide file tree

Showing 14 changed files with 1,304 additions and 1,202 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+25-AUG-2017: 7.2.9
+
+- Moves clickable label links to tooltip in edit mode
+
 25-AUG-2017: 7.2.8
 
 - Fixes open in new window for local exports

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.2.8
+7.2.9
diff --git a/war/cache.manifest b/war/cache.manifest
@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 08/25/2017 09:23 AM
+# 08/25/2017 12:29 PM
 
 app.html
 index.html?offline=1

diff --git a/war/js/app.min.js b/war/js/app.min.js
diff --git a/war/js/atlas-viewer.min.js b/war/js/atlas-viewer.min.js
diff --git a/war/js/atlas.min.js b/war/js/atlas.min.js
diff --git a/war/js/diagramly/Trees.js b/war/js/diagramly/Trees.js
@@ -353,21 +353,21 @@ EditorUi.prototype.addTrees = function()
 		{
 			var newSource = target;
 
-			if (isTreeVertex(target))
+			if (cells != null && isTreeVertex(target))
 			{
 				// Handles only drag from tree or from sidebar with dangling edges
 				for (var i = 0; i < cells.length; i++)
 				{
 					if (isTreeVertex(cells[i]) || (graph.model.isEdge(cells[i]) &&
 						graph.model.getTerminal(cells[i], true) == null))
 					{
-						target = null;
+						target = graph.model.getParent(cells[i]);
 						break;
 					}
 				}
 
 				// Applies distance between previous and current parent for non-sidebar drags
-				if (newSource != null && target == null && this.view.getState(cells[0]) != null)
+				if (newSource != null && target != newSource && this.view.getState(cells[0]) != null)
 				{
 					var edges = graph.getIncomingEdges(cells[0]);
 
@@ -391,7 +391,7 @@ EditorUi.prototype.addTrees = function()
 
 			result = graphMoveCells.apply(this, arguments);
 
-			if (result.length == cells.length)
+			if (result != null && cells != null && result.length == cells.length)
 			{
 				for (var i = 0; i < result.length; i++)
 				{
@@ -427,7 +427,7 @@ EditorUi.prototype.addTrees = function()
 								{
 									var temp = newSource;
 
-									if (temp == null)
+									if (temp == null || temp == graph.model.getParent(cells[i]))
 									{
 										temp = graph.model.getTerminal(edges[0], true);
 									}
@@ -566,8 +566,11 @@ EditorUi.prototype.addTrees = function()
 				clones[1].geometry.x = cell.geometry.x + cell.geometry.width - clones[1].geometry.width; 
 			}
 
-			clones[1].geometry.x -= pgeo.x;
-			clones[1].geometry.y -= pgeo.y;
+			if (graph.view.currentRoot != parent)
+			{
+				clones[1].geometry.x -= pgeo.x;
+				clones[1].geometry.y -= pgeo.y;
+			}
 
 			// Moves existing siblings
 			var state = graph.view.getState(cell);
@@ -687,8 +690,16 @@ EditorUi.prototype.addTrees = function()
 			graph.model.setTerminal(clones[0], cell, false);
 
 			// Makes space for new parent
+			var parent = graph.model.getParent(cell);
+			var pgeo = parent.geometry;
 			var subtree = [];
 
+			if (graph.view.currentRoot != parent)
+			{
+				clones[1].geometry.x -= pgeo.x;
+				clones[1].geometry.y -= pgeo.y;
+			}
+
 			graph.traverse(cell, true, function(vertex, edge)
 			{
 				if (edge != null)
@@ -725,7 +736,7 @@ EditorUi.prototype.addTrees = function()
 
 			graph.moveCells(subtree, dx, dy);
 
-			return graph.addCells(clones);
+			return graph.addCells(clones, parent);
 		}
 		finally
 		{
@@ -748,6 +759,12 @@ EditorUi.prototype.addTrees = function()
 			var pgeo = parent.geometry;
 			var targets = [];
 
+			// Not offset if inside group
+			if (graph.view.currentRoot == parent)
+			{
+				pgeo = new mxRectangle();
+			}
+
 			for (var i = 0; i < edges.length; i++)
 			{
 				var target = graph.model.getTerminal(edges[i], false);

diff --git a/war/js/diagramly/sidebar/Sidebar-Basic.js b/war/js/diagramly/sidebar/Sidebar-Basic.js
@@ -12,14 +12,10 @@
 
 		this.addPaletteFunctions('basic', mxResources.get('basic'), false,
 		[
-			this.createVertexTemplateEntry('shape=partialRectangle;whiteSpace=wrap;html=1;left=0;right=0;fillColor=none;', 120, 60, '', 'Partial Rectangle'),
 			this.createVertexTemplateEntry('shape=partialRectangle;whiteSpace=wrap;html=1;top=0;bottom=0;fillColor=none;', 120, 60, '', 'Partial Rectangle'),
-			this.createVertexTemplateEntry('shape=partialRectangle;whiteSpace=wrap;html=1;left=0;right=0;top=0;fillColor=none;routingCenterY=0.5;', 120, 60, '', 'Partial Rectangle'),
 			this.createVertexTemplateEntry('shape=partialRectangle;whiteSpace=wrap;html=1;right=0;top=0;bottom=0;fillColor=none;routingCenterX=-0.5;', 120, 60, '', 'Partial Rectangle'),
 			this.createVertexTemplateEntry('shape=partialRectangle;whiteSpace=wrap;html=1;bottom=0;right=0;fillColor=none;', 120, 60, '', 'Partial Rectangle'),
 			this.createVertexTemplateEntry('shape=partialRectangle;whiteSpace=wrap;html=1;top=0;left=0;fillColor=none;', 120, 60, '', 'Partial Rectangle'),
-			this.createVertexTemplateEntry('shape=partialRectangle;whiteSpace=wrap;html=1;bottom=1;right=1;top=0;bottom=1;fillColor=none;routingCenterX=-0.5;', 120, 60, '', 'Partial Rectangle'),
-		 	this.createEdgeTemplateEntry('shape=filledEdge;fixDash=1;rounded=0;endArrow=none;strokeWidth=10;fillColor=#ffffff;edgeStyle=orthogonalEdgeStyle;', 120, 60, '', 'Filled Edge'),
 			this.createVertexTemplateEntry(s2 + '4_point_star', w, h, '', '4 Point Star', null, null, this.getTagsForStencil(gn, '4_point_star', dt).join(' ')),
 			this.createVertexTemplateEntry(s2 + '6_point_star', w, h * 0.9, '', '6 Point Star', null, null, this.getTagsForStencil(gn, '6_point_star', dt).join(' ')),
 			this.createVertexTemplateEntry(s2 + '8_point_star', w, h, '', '8 Point Star', null, null, this.getTagsForStencil(gn, '8_point_star', dt).join(' ')),