24.6.4 release

jgraph · Jun 27, 2024 · 61019d0 · 61019d0
1 parent c706924
commit 61019d0
Show file tree

Hide file tree

Showing 12 changed files with 995 additions and 975 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+27-JUN 2024: 24.6.4
+
+- Fixes reset of selected shape groups [drawio-desktop#1783]
+- Removes broken help link in template dialog
+- Fixes missing URL parameters for published Drive files [jgraph/drawio#4501]
+- Fixes arrows in mermaid sequence diagram converter
+- Adds UI switch to toggle animations [jgraph/drawio#4491]
+
 25-JUN-2024: 24.6.3
 
 - Removes drop shadow in PDF export [jgraph/drawio-desktop#1784]

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-24.6.3
+24.6.4
diff --git a/src/main/webapp/js/app.min.js b/src/main/webapp/js/app.min.js
diff --git a/src/main/webapp/js/diagramly/Dialogs.js b/src/main/webapp/js/diagramly/Dialogs.js
@@ -3530,7 +3530,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 				function doSave(mode, folderId, filename)
 				{
 					editorUi.createFile(filename, templateXml, (templateLibs != null &&
-						templateLibs.length > 0) ? templateLibs : mode, null, function()
+						templateLibs.length > 0) ? templateLibs : null, mode, function()
 					{
 						editorUi.hideDialog();
 					}, null, folderId, null, (templateClibs != null &&
@@ -3671,6 +3671,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 					generateElt.style.backgroundSize = 'contain';
 					generateInput.style.visibility = 'hidden';
 					generateButton.style.visibility = 'hidden';
+					helpGenerate.style.visibility = 'hidden';
 					editGenerate.style.visibility = 'hidden';
 					magnifyGenerate.style.visibility = (lastAiXml != null) ? 'visible' : 'hidden';
 					generateElt.getElementsByTagName('table')[0].style.visibility = 'visible';
@@ -3696,6 +3697,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 				{
 					generateInput.style.visibility = 'visible';
 					generateButton.style.visibility = 'visible';
+					helpGenerate.style.visibility = 'visible';
 					editGenerate.style.visibility = 'hidden';
 					magnifyGenerate.style.visibility = 'hidden';
 				}
@@ -3776,9 +3778,23 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 	editGenerate.style.right = '';
 	editGenerate.style.left = '2px';
 
+	var helpGenerate = magnifyImage.cloneNode(true);
+	helpGenerate.setAttribute('src', Editor.helpImage);
+	helpGenerate.setAttribute('title', mxResources.get('help'));
+	helpGenerate.style.opacity = '1';
+	helpGenerate.style.right = '-8px';
+	helpGenerate.style.top = '-8px';
+
+	mxEvent.addListener(helpGenerate, 'click', function(evt)
+	{
+		editorUi.openLink('https://www.drawio.com/blog/write-query-generate-diagram');
+		mxEvent.consume(evt);
+	});
+
 	generateInput.style.visibility = 'hidden';
 	generateButton.style.visibility = 'hidden';
 	editGenerate.style.visibility = 'hidden';
+	helpGenerate.style.visibility = 'hidden';
 	magnifyGenerate.style.visibility = 'hidden';
 
 	function createGenerate()
@@ -3787,6 +3803,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 		generateElt.getElementsByTagName('table')[0].style.visibility = 'hidden';
 		generateInput.style.visibility = 'visible';
 		generateButton.style.visibility = 'visible';
+		helpGenerate.style.visibility = 'visible';
 		editGenerate.style.visibility = 'hidden';
 		magnifyGenerate.style.visibility = 'hidden';
 		generateInput.focus();
@@ -3821,6 +3838,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 	{
 		generateInput.style.visibility = 'hidden';
 		generateButton.style.visibility = 'hidden';
+		helpGenerate.style.visibility = 'hidden';
 		generateElt.style.backgroundImage = generateBackground;
 		generateElt.style.backgroundSize = 'contain';
 		editGenerate.style.visibility = 'visible';
@@ -3835,6 +3853,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 		{
 			generateInput.style.visibility = 'hidden';
 			generateButton.style.visibility = 'hidden';
+			helpGenerate.style.visibility = 'hidden';
 			var listenerTriggered = false;
 
 			var prompt = 'Write a detailed and complex MermaidJS declaration for ' +
@@ -3880,6 +3899,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 					{
 						generateInput.style.visibility = 'visible';
 						generateButton.style.visibility = 'visible';
+						helpGenerate.style.visibility = 'visible';
 						editGenerate.style.visibility = 'visible';
 						magnifyGenerate.style.visibility = 'visible';
 						editorUi.handleError(e);
@@ -4149,10 +4169,12 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 			if (templateType == 'generative' && generateElt == null)
 			{
 				elt.style.backgroundImage = generateBackground;
+				elt.style.overflow = 'visible';
 				elt.appendChild(magnifyGenerate);
 				elt.appendChild(editGenerate);
 				elt.appendChild(generateInput);
 				elt.appendChild(generateButton);
+				elt.appendChild(helpGenerate);
 				generateElt = elt;
 			}
 
@@ -4795,17 +4817,6 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
 	btns.style.bottom = '24px';
 	btns.style.right = '40px';
 
-	if (!compact && !editorUi.isOffline() && showName && callback == null && !createOnly)
-	{
-		var helpBtn = mxUtils.button(mxResources.get('help'), function()
-		{
-			editorUi.openLink('https://support.draw.io/display/DO/Creating+and+Opening+Files');
-		});
-
-		helpBtn.className = 'geBtn';	
-		btns.appendChild(helpBtn);
-	}
-
 	var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
 	{
 		if (cancelCallback != null)

diff --git a/src/main/webapp/js/diagramly/EditorUi.js b/src/main/webapp/js/diagramly/EditorUi.js
@@ -6414,10 +6414,7 @@
 
 		if (lightbox)
 		{
-			if (EditorUi.lightboxHost != 'https://viewer.diagrams.net' || urlParams['dev'] == '1')
-			{
-				params.push('lightbox=1');
-			}
+			params.push('lightbox=1');
 
 			if (linkTarget != 'auto')
 			{
@@ -6457,8 +6454,7 @@
 	{
 		var file = this.getCurrentFile();
 		params = this.createUrlParameters(linkTarget, linkColor,
-			lightbox && (file == null || file.constructor != window.DriveFile),
-			editLink, layers, params);
+			lightbox, editLink, layers, params);
 		var addTitle = true;
 		var data = '';
 
@@ -14466,20 +14462,6 @@
 				mxSettings.save();
 			}));
 
-			/**
-			 * Persists animations switch.
-			 */
-			if (mxSettings.settings.enableAnimations != null)
-			{
-				Editor.enableAnimations = mxSettings.settings.enableAnimations;
-			}
-
-			this.addListener('enableAnimationsChanged', mxUtils.bind(this, function(sender, evt)
-			{
-				mxSettings.settings.enableAnimations = Editor.enableAnimations;
-				mxSettings.save();
-			}));
-
 			/**
 			 * Persists autosave switch in Chrome app.
 			 */
@@ -14493,6 +14475,23 @@
 
 				this.editor.autosave = mxSettings.getAutosave();
 			}
+
+			if (!this.editor.chromeless || this.editor.editable)
+			{
+				/**
+				 * Persists animations switch.
+				 */
+				if (mxSettings.settings.enableAnimations != null)
+				{
+					Editor.enableAnimations = mxSettings.settings.enableAnimations;
+				}
+
+				this.addListener('enableAnimationsChanged', mxUtils.bind(this, function(sender, evt)
+				{
+					mxSettings.settings.enableAnimations = Editor.enableAnimations;
+					mxSettings.save();
+				}));
+			}
 
 			if (this.sidebar != null)
 			{

diff --git a/src/main/webapp/js/diagramly/Menus.js b/src/main/webapp/js/diagramly/Menus.js
@@ -4413,8 +4413,8 @@
 					editorUi.menus.addMenuItems(menu, ['pageTabs'], parent);
 				}
 
-				this.addMenuItems(menu, ['tooltips', 'ruler', '-', 'grid', 'guides',
-					'-', 'connectionArrows', 'connectionPoints', '-',
+				this.addMenuItems(menu, ['ruler', '-', 'tooltips', 'animations',
+					'-', 'grid', 'guides', '-', 'connectionArrows', 'connectionPoints', '-',
 					'resetView', 'zoomIn', 'zoomOut'], parent);
 
 				if (urlParams['sketch'] != '1')
@@ -4629,7 +4629,7 @@
 
 				editorUi.menus.addSubmenu('units', menu, parent);
 				editorUi.menus.addMenuItems(menu, ['-', 'copyConnect',
-					'collapseExpand', 'tooltips', '-'], parent);
+					'collapseExpand', '-', 'tooltips', 'animations', '-'], parent);
 
 				var file = editorUi.getCurrentFile();