Merge commit 'b221769961063934ff795cbe8e10e2879436349c' into release

jgraph · Oct 2, 2023 · 96ef68c · 96ef68c
2 parents 17072da + b221769
commit 96ef68c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/drawio b/drawio
diff --git a/src/main/electron.js b/src/main/electron.js
@@ -1602,6 +1602,7 @@ function exportDiagram(event, args, directFinalize)
 								//This height adjustment fixes the output. TODO Test more cases
 								height: (args.pageHeight * 1.025) * MICRON_TO_PIXEL
 							},
+							landscape: args.pageWidth > args.pageHeight,
 							marginsType: 1 // no margin
 						};
 

diff --git a/yarn.lock b/yarn.lock
@@ -163,14 +163,14 @@
   integrity sha512-xPSg0jm4mqgEkNhowKgZFBNtwoEwF6gJ4Dhww+GFpm3IgtNseHQZ5IqdNwnquZEoANxyDAKDRAdVo4Z72VvD/g==
 
 "@types/node@*":
-  version "20.7.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.7.1.tgz#06d732ead0bd5ad978ef0ea9cbdeb24dc8717514"
-  integrity sha512-LT+OIXpp2kj4E2S/p91BMe+VgGX2+lfO+XTpfXhh+bCk2LkQtHZSub8ewFBMGP5ClysPjTDFa4sMI8Q3n4T0wg==
+  version "20.8.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.0.tgz#10ddf0119cf20028781c06d7115562934e53f745"
+  integrity sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ==
 
 "@types/node@^18.11.18":
-  version "18.18.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.0.tgz#bd19d5133a6e5e2d0152ec079ac27c120e7f1763"
-  integrity sha512-3xA4X31gHT1F1l38ATDIL9GpRLdwVhnEFC8Uikv5ZLlXATwrCYyPq7ZWHxzxc3J/30SUiwiYT+bQe0/XvKlWbw==
+  version "18.18.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.1.tgz#80b22f3df719f15c9736207980e95f35d01ec1aa"
+  integrity sha512-3G42sxmm0fF2+Vtb9TJQpnjmP+uKlWvFa8KoEGquh4gqRmoUG/N0ufuhikw6HEsdG2G2oIKhog1GCTfz9v5NdQ==
 
 "@types/plist@^3.0.1":
   version "3.0.3"
@@ -807,9 +807,9 @@ electron-updater@^6.1.1:
     tiny-typed-emitter "^2.1.0"
 
 electron@^25.3.1:
-  version "25.8.3"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.3.tgz#f92426042eecf3286db40fd84df9179bba168c12"
-  integrity sha512-BdcTIrhQIf6YgsihCXYh3DgKobtLaNcFb1B5C/5euepxxXQ7qmTWC6WgNUm+IntLOFEDQO926rvm2nhRdSN+Nw==
+  version "25.8.4"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.4.tgz#b50877aac7d96323920437baf309ad86382cb455"
+  integrity sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"
+5 −0		ChangeLog
+1 −1		VERSION
+1 −0		etc/build/build.xml
+56 −11		src/main/mxgraph/handler/mxGraphHandler.js
+29 −0		src/main/mxgraph/shape/mxMarker.js
+27 −0		src/main/mxgraph/util/mxUtils.js
+ −		src/main/webapp/images/sidebar-salesforce.png
+1,642 −1,567		src/main/webapp/js/app.min.js
+1 −2		src/main/webapp/js/diagramly/App.js
+1 −0		src/main/webapp/js/diagramly/Devel.js
+1 −0		src/main/webapp/js/diagramly/Dialogs.js
+1 −0		src/main/webapp/js/diagramly/Editor.js
+3 −105		src/main/webapp/js/diagramly/EditorUi.js
+769 −0		src/main/webapp/js/diagramly/sidebar/Sidebar-Salesforce.js
+3 −3		src/main/webapp/js/diagramly/sidebar/Sidebar.js
+30 −9		src/main/webapp/js/grapheditor/EditorUi.js
+1,262 −1,186		src/main/webapp/js/integrate.min.js
+1 −0		src/main/webapp/js/stencils.min.js
+1,331 −1,333		src/main/webapp/js/viewer-static.min.js
+1,331 −1,333		src/main/webapp/js/viewer.min.js
+93 −92		src/main/webapp/mxgraph/mxClient.js
+1 −1		src/main/webapp/service-worker.js
+1 −1		src/main/webapp/service-worker.js.map
+8,360 −0		src/main/webapp/stencils/salesforce.xml