15.9.1 release

ChangeLog

@@ -1,3 +1,16 @@
+03-DEC-2021: 15.9.1
+
+- Fixes build error
+
+03-DEC-2021: 15.9.0
+
+- Fixes possible hidden tool windows in sketch
+- [conf cloud] Fixes page ids export error log
+- [conf cloud] Adds fallback for the viewer when a file returns 403 for a specific version
+- Fixes in-app help search query
+- Improves pinch to zoom on trackpad https://github.com/jgraph/drawio/issues/2469
+- Updates GCP icons
+
 02-DEC-2021: 15.8.9
 
 - Adds Shift+Click on Zoom in Sketch theme

VERSION

@@ -1 +1 @@
-15.8.9
+15.9.1

etc/build/build.xml

@@ -119,7 +119,7 @@
 				<file name="Sidebar-FluidPower.js" />
 				<file name="Sidebar-GCP.js" />
 				<file name="Sidebar-GCP2.js" />
-				<file name="Sidebar-GCP3.js" />
+				<file name="Sidebar-GCPIcons.js" />
 				<file name="Sidebar-Gmdl.js" />
 				<file name="Sidebar-IBM.js" />
 				<file name="Sidebar-Infographic.js" />

src/main/webapp/js/diagramly/Devel.js

@@ -209,7 +209,7 @@ mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Flowchart.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-FluidPower.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-GCP.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-GCP2.js');
-mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-GCP3.js');
+mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-GCPIcons.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Gmdl.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-IBM.js');
 mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Infographic.js');

src/main/webapp/js/diagramly/Menus.js

@@ -1490,7 +1490,7 @@
 					if (e.keyCode == 13 && term.length > 0)
 					{
 						this.editorUi.openLink('https://www.diagrams.net/search?src=' +
-							EditorUi.isElectronApp? 'DESKTOP' : encodeURIComponent(location.host) + 
+							(EditorUi.isElectronApp ? 'DESKTOP' : encodeURIComponent(location.host)) + 
 							'&search=' + encodeURIComponent(term));
 						input.value = '';
 						EditorUi.logEvent({category: 'SEARCH-HELP', action: 'search', label: term});

src/main/webapp/js/diagramly/Minimal.js

@@ -52,9 +52,8 @@ EditorUi.initMinimalTheme = function()
 	    	var iiw = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
 	        var ih = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
 	        
-	        x = Math.max(0, Math.min(x, iiw - this.table.clientWidth));
-	        y = Math.max(0, Math.min(y, ih - this.table.clientHeight -
-				((urlParams['sketch'] == '1') ? 3 : 48)));
+	        x = Math.max(0, Math.min(x, iiw - this.table.clientWidth - 2));
+	        y = Math.max(0, Math.min(y, ih - this.table.clientHeight - 2));
 			
 	        if (this.getX() != x || this.getY() != y)
 	        {
@@ -101,6 +100,11 @@ EditorUi.initMinimalTheme = function()
 
 				return format;
 			});
+
+			ui.formatWindow.window.addListener(mxEvent.SHOW, mxUtils.bind(this, function()
+			{
+				ui.formatWindow.window.fit();
+			}));
 			
 			ui.formatWindow.window.minimumSize = new mxRectangle(0, 0, 240, 80);
 			ui.formatWindow.window.setVisible(true);
@@ -110,11 +114,6 @@ EditorUi.initMinimalTheme = function()
 	        ui.formatWindow.window.setVisible((visible != null) ?
 	        	visible : !ui.formatWindow.window.isVisible());
 	    }
-
-        if (ui.formatWindow.window.isVisible() && urlParams['sketch'] != '1')
-        {
-            ui.formatWindow.window.fit();
-        }
 	};
 
 	function toggleShapes(ui, visible)
@@ -227,6 +226,11 @@ EditorUi.initMinimalTheme = function()
 				return container;
 			});
 	        
+			ui.sidebarWindow.window.addListener(mxEvent.SHOW, mxUtils.bind(this, function()
+			{
+				ui.sidebarWindow.window.fit();
+			}));
+
 			ui.sidebarWindow.window.minimumSize = new mxRectangle(0, 0, 90, 90);
 			ui.sidebarWindow.window.setVisible(true);
 			
@@ -242,11 +246,6 @@ EditorUi.initMinimalTheme = function()
     		ui.sidebarWindow.window.setVisible((visible != null) ?
     			visible : !ui.sidebarWindow.window.isVisible());
 		}
-		
-		if (ui.sidebarWindow.window.isVisible())
-		{
-			ui.sidebarWindow.window.fit();
-		}
 	};
 	
     // Changes colors for some UI elements

src/main/webapp/js/grapheditor/EditorUi.js

@@ -2843,8 +2843,8 @@ EditorUi.prototype.initCanvas = function()
 		                dx = graph.container.offsetWidth / 2 - cursorPosition.x + offset.x;
 		                dy = graph.container.offsetHeight / 2 - cursorPosition.y + offset.y;
 		            }
-	
-		            graph.zoom(graph.cumulativeZoomFactor);
+
+					graph.zoom(graph.cumulativeZoomFactor, null, 20);
 		            var s = graph.view.scale;
 		            
 		            if (s != prev)
@@ -2884,10 +2884,10 @@ EditorUi.prototype.initCanvas = function()
 		}, 0);
 	};
 	
-	var lastZoomEvent = Date.now();
-
-	graph.lazyZoom = function(zoomIn, ignoreCursorPosition, delay)
+	graph.lazyZoom = function(zoomIn, ignoreCursorPosition, delay, factor)
 	{
+		factor = (factor != null) ? factor : this.zoomFactor;
+
 		// TODO: Fix ignored cursor position if scrollbars are disabled
 		ignoreCursorPosition = ignoreCursorPosition || !graph.scrollbars;
 		
@@ -2898,14 +2898,6 @@ EditorUi.prototype.initCanvas = function()
 				graph.container.offsetTop + graph.container.clientHeight / 2);
 		}
 		
-		// Ignores events to reduce touchpad and magic mouse zoom speed
-		if (!mxClient.IS_IOS && Date.now() - lastZoomEvent < 15)
-		{
-			return;
-		}
-		
-		lastZoomEvent = Date.now();
-
 		// Switches to 5% zoom steps below 15%
 		if (zoomIn)
 		{
@@ -2915,10 +2907,8 @@ EditorUi.prototype.initCanvas = function()
 			}
 			else
 			{
-				// Uses to 5% zoom steps for better grid rendering in webkit
-				// and to avoid rounding errors for zoom steps
-				this.cumulativeZoomFactor *= this.zoomFactor;
-				this.cumulativeZoomFactor = Math.round(this.view.scale * this.cumulativeZoomFactor * 20) / 20 / this.view.scale;
+				this.cumulativeZoomFactor *= factor;
+				this.cumulativeZoomFactor = Math.round(this.view.scale * this.cumulativeZoomFactor * 100) / 100 / this.view.scale;
 			}
 		}
 		else
@@ -2929,10 +2919,8 @@ EditorUi.prototype.initCanvas = function()
 			}
 			else
 			{
-				// Uses to 5% zoom steps for better grid rendering in webkit
-				// and to avoid rounding errors for zoom steps
-				this.cumulativeZoomFactor /= this.zoomFactor;
-				this.cumulativeZoomFactor = Math.round(this.view.scale * this.cumulativeZoomFactor * 20) / 20 / this.view.scale;
+				this.cumulativeZoomFactor /= factor;
+				this.cumulativeZoomFactor = Math.round(this.view.scale * this.cumulativeZoomFactor * 100) / 100 / this.view.scale;
 			}
 		}
 
@@ -3032,7 +3020,7 @@ EditorUi.prototype.initCanvas = function()
 			else if (force || graph.isZoomWheelEvent(evt))
 			{
 				var source = mxEvent.getSource(evt);
-				
+
 				while (source != null)
 				{
 					if (source == graph.container)
@@ -3041,7 +3029,15 @@ EditorUi.prototype.initCanvas = function()
 						cursorPosition = (cx != null && cy!= null) ? new mxPoint(cx, cy) :
 							new mxPoint(mxEvent.getClientX(evt), mxEvent.getClientY(evt));
 						forcedZoom = force;
-						graph.lazyZoom(up);
+						var factor = graph.zoomFactor;
+
+						// Slower zoom for pinch gesture on trackpad
+						if (evt.deltaY != null && Math.round(evt.deltaY) != evt.deltaY)
+						{
+							factor = 1 + (Math.abs(evt.deltaY) / 20) * (factor - 1);
+						}
+
+						graph.lazyZoom(up, null, null, factor);
 						mxEvent.consume(evt);
 				
 						return false;