10.5.9 release

ChangeLog

@@ -1,3 +1,10 @@
+27-MAR-2019: 10.5.9
+
+- Change to connection points and arrows trigger autosave
+- Adds style options for edge labels in Arrange panel
+- Fixes scroll during Alt+mouse wheel in Chrome
+- Uses mxGraph 4.0.1 beta 5
+
 26-MAR-2019: 10.5.8
 
 - Hides icon in Confluence cloud for resolved comments

VERSION

@@ -1 +1 @@
-10.5.8
+10.5.9

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 03/26/2019 03:23 PM
+# 03/27/2019 02:45 PM
 
 app.html
 index.html?offline=1

src/main/webapp/js/diagramly/DrawioFile.js

@@ -1236,6 +1236,8 @@ DrawioFile.prototype.installListeners = function()
 		this.ui.addListener('gridEnabledChanged', this.changeListener);
 		this.ui.addListener('guidesEnabledChanged', this.changeListener);
 		this.ui.addListener('pageViewChanged', this.changeListener);
+		this.ui.addListener('connectionPointsChanged', this.changeListener);
+		this.ui.addListener('connectionArrowsChanged', this.changeListener);
 	}
 };
 

src/main/webapp/js/diagramly/Editor.js

@@ -2441,7 +2441,7 @@
 			// TODO: Update sstate in Format
 			var sstate = this.format.createSelectionState();
 
-			if (sstate.style.shape != 'image')
+			if (sstate.style.shape != 'image' && !sstate.containsLabel)
 			{
 				this.container.appendChild(this.addStyles(this.createPanel()));
 			}

src/main/webapp/js/diagramly/EditorUi.js

@@ -12191,7 +12191,8 @@ var CommentsWindow = function(editorUi, x, y, w, h, saveCallback)
 {
 	var readOnly = !editorUi.canComment();
 	var canReplyToReplies = editorUi.canReplyToReplies();
-	
+	var curEdited = null;
+		
 	var div = document.createElement('div');
 	div.className = 'geCommentsWin';
 	div.style.background = (Dialog.backdropColor == 'white') ? 'whiteSmoke' : Dialog.backdropColor;
@@ -12248,13 +12249,15 @@ var CommentsWindow = function(editorUi, x, y, w, h, saveCallback)
 	
 	function editComment(comment, cdiv, saveCallback, deleteOnCancel)
 	{
+		curEdited = {div: cdiv, comment: comment, saveCallback: saveCallback, deleteOnCancel: deleteOnCancel};
+		
 		var commentTxt = cdiv.querySelector('.geCommentTxt');
 		var actionsDiv = cdiv.querySelector('.geCommentActionsList');
 		
 		var textArea = document.createElement('textarea');
 		textArea.className = 'geCommentEditTxtArea';
 		textArea.style.minHeight = commentTxt.offsetHeight + 'px';
-		textArea.value = commentTxt.innerHTML;
+		textArea.value = comment.content;
 		cdiv.insertBefore(textArea, commentTxt);
 		
 		var btnDiv = document.createElement('div');
@@ -12279,6 +12282,8 @@ var CommentsWindow = function(editorUi, x, y, w, h, saveCallback)
 			{
 				reset();
 			}
+			
+			curEdited = null;
 		});
 		
 		cancelBtn.className = 'geCommentEditBtn';
@@ -12291,6 +12296,7 @@ var CommentsWindow = function(editorUi, x, y, w, h, saveCallback)
 			mxUtils.write(commentTxt, comment.content);
 			reset();
 			saveCallback(comment);
+			curEdited = null;
 		});
 		
 		// Updates modified state and handles placeholder text
@@ -12648,6 +12654,22 @@ var CommentsWindow = function(editorUi, x, y, w, h, saveCallback)
 			addComment(reply, comment.replies, null, level + 1, showResolved);
 		}
 		
+		if (curEdited != null)
+		{
+			if (curEdited.comment.id == comment.id)
+			{
+				var origContent = comment.content;
+				comment.content = curEdited.comment.content;
+				editComment(comment, cdiv, curEdited.saveCallback, curEdited.deleteOnCancel);
+				comment.content = origContent;
+			}
+			else if (curEdited.comment.id == null && curEdited.comment.pCommentId == comment.id)
+			{
+				listDiv.appendChild(curEdited.div);
+				editComment(curEdited.comment, curEdited.div, curEdited.saveCallback, curEdited.deleteOnCancel);
+			}
+		}
+
 		return cdiv;
 	};
 
@@ -12764,6 +12786,17 @@ var CommentsWindow = function(editorUi, x, y, w, h, saveCallback)
 
 	var refresh = mxUtils.bind(this, function()
 	{
+		if (curEdited != null)
+		{
+			curEdited.div = curEdited.div.cloneNode(true);
+			var commentEditTxt = curEdited.div.querySelector('.geCommentEditTxtArea');
+			var commentEditBtns = curEdited.div.querySelector('.geCommentEditBtns');
+			
+			curEdited.comment.content = commentEditTxt.value;
+			commentEditTxt.parentNode.removeChild(commentEditTxt);
+			commentEditBtns.parentNode.removeChild(commentEditBtns);
+		}
+		
 		listDiv.innerHTML = '<div style="padding-top:10px;text-align:center;"><img src="/images/spin.gif" valign="middle"> ' +
 			mxUtils.htmlEntities(mxResources.get('loading')) + '...</div>';
 		
@@ -12806,6 +12839,14 @@ var CommentsWindow = function(editorUi, x, y, w, h, saveCallback)
 					sortReplies(comments[i].replies);
 					addComment(comments[i], comments, null, 0, resolvedChecked);
 				}
+				
+				//New comment case
+				if (curEdited != null && curEdited.comment.id == null && curEdited.comment.pCommentId == null)
+				{
+					listDiv.appendChild(curEdited.div);
+					editComment(curEdited.comment, curEdited.div, curEdited.saveCallback, curEdited.deleteOnCancel);
+				}
+				
 			}, function()
 			{
 				listDiv.innerHTML = mxUtils.htmlEntities(mxResources.get('error'));

src/main/webapp/js/diagramly/sidebar/Sidebar-AWS4.js

@@ -956,8 +956,6 @@
 					 w2, w2, '', 'Elemental MediaConvert', null, null, this.getTagsForStencil(gn, 'elemental mediaconvert', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.elemental_medialive;',
 					 w2, w2, '', 'Elemental MediaLive', null, null, this.getTagsForStencil(gn, 'elemental medialive', dt).join(' ')),
-			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.elemental_medialive;',
-					 w2, w2, '', 'Elemental MediaLive', null, null, this.getTagsForStencil(gn, 'elemental medialive', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.elemental_mediapackage;',
 					 w2, w2, '', 'Elemental MediaPackage', null, null, this.getTagsForStencil(gn, 'elemental mediapackage', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.elemental_mediastore;',

src/main/webapp/js/mxgraph/EditorUi.js

@@ -2105,13 +2105,13 @@ EditorUi.prototype.initCanvas = function()
 					graph.lazyZoom(up);
 					mxEvent.consume(evt);
 			
-					return;
+					return false;
 				}
 				
 				source = source.parentNode;
 			}
 		}
-	}));
+	}), graph.container);
 };
 
 /**

src/main/webapp/js/mxgraph/Format.js

@@ -1492,6 +1492,20 @@ ArrangePanel.prototype.init = function()
 	}
 	
 	this.container.appendChild(this.addGroupOps(this.createPanel()));
+
+	if (ss.containsLabel)
+	{
+		// Adds functions from hidden style format panel
+		var span = document.createElement('div');
+		span.style.width = '100%';
+		span.style.marginTop = '0px';
+		span.style.fontWeight = 'bold';
+		span.style.padding = '10px 0 0 18px';
+		mxUtils.write(span, mxResources.get('style'));
+		this.container.appendChild(span);
+			
+		new StyleFormatPanel(this.format, this.editorUi, this.container);
+	}
 };
 
 /**
@@ -3868,24 +3882,28 @@ StyleFormatPanel.prototype.init = function()
 	var graph = editor.graph;
 	var ss = this.format.getSelectionState();
 	
-	if (ss.containsImage && ss.vertices.length == 1 && ss.style.shape == 'image' &&
-		ss.style.image != null && ss.style.image.substring(0, 19) == 'data:image/svg+xml;')
+	if (!ss.containsLabel)
 	{
-		this.container.appendChild(this.addSvgStyles(this.createPanel()));
-	}
+		if (ss.containsImage && ss.vertices.length == 1 && ss.style.shape == 'image' &&
+			ss.style.image != null && ss.style.image.substring(0, 19) == 'data:image/svg+xml;')
+		{
+			this.container.appendChild(this.addSvgStyles(this.createPanel()));
+		}
+		
+		if (!ss.containsImage || ss.style.shape == 'image')
+		{
+			this.container.appendChild(this.addFill(this.createPanel()));
+		}
 	
-	if (!ss.containsImage || ss.style.shape == 'image')
-	{
-		this.container.appendChild(this.addFill(this.createPanel()));
+		this.container.appendChild(this.addStroke(this.createPanel()));
+		this.container.appendChild(this.addLineJumps(this.createPanel()));
+		var opacityPanel = this.createRelativeOption(mxResources.get('opacity'), mxConstants.STYLE_OPACITY, 41);
+		opacityPanel.style.paddingTop = '8px';
+		opacityPanel.style.paddingBottom = '8px';
+		this.container.appendChild(opacityPanel);
+		this.container.appendChild(this.addEffects(this.createPanel()));
 	}
-
-	this.container.appendChild(this.addStroke(this.createPanel()));
-	this.container.appendChild(this.addLineJumps(this.createPanel()));
-	var opacityPanel = this.createRelativeOption(mxResources.get('opacity'), mxConstants.STYLE_OPACITY, 41);
-	opacityPanel.style.paddingTop = '8px';
-	opacityPanel.style.paddingBottom = '8px';
-	this.container.appendChild(opacityPanel);
-	this.container.appendChild(this.addEffects(this.createPanel()));
+	
 	var opsPanel = this.addEditOps(this.createPanel());
 	
 	if (opsPanel.firstChild != null)