Merge remote-tracking branch 'origin/switch_diagram_mode' into 2026.4-test

This commit is contained in:
yflory 2026-04-30 13:31:21 +02:00
commit 44a6a8defd
3 changed files with 9 additions and 15 deletions

6
package-lock.json generated
View File

@ -26,7 +26,7 @@
"cookie-parser": "^1.4.7",
"croppie": "^2.5.0",
"dragula": "3.7.2",
"drawio": "github:cryptpad/drawio-npm#npm-29.6.7+1",
"drawio": "github:cryptpad/drawio-npm#npm-29.6.7+3",
"express": "~4.22.1",
"file-saver": "1.3.1",
"fs-extra": "^7.0.0",
@ -1900,8 +1900,8 @@
}
},
"node_modules/drawio": {
"version": "29.6.7+1",
"resolved": "git+ssh://git@github.com/cryptpad/drawio-npm.git#9da41bba34dd5226a3b7147c8974433523970db3"
"version": "29.6.7+3",
"resolved": "git+ssh://git@github.com/cryptpad/drawio-npm.git#c3493636b4f3a65d9f068245a968887fd1332326"
},
"node_modules/dunder-proto": {
"version": "1.0.1",

View File

@ -29,7 +29,7 @@
"cookie-parser": "^1.4.7",
"croppie": "^2.5.0",
"dragula": "3.7.2",
"drawio": "github:cryptpad/drawio-npm#npm-29.6.7+1",
"drawio": "github:cryptpad/drawio-npm#npm-29.6.7+3",
"express": "~4.22.1",
"file-saver": "1.3.1",
"fs-extra": "^7.0.0",

View File

@ -196,6 +196,10 @@ define([
parameters.set('chrome', '1');
parameters.set('grid', '1');
}
checkDefaultTheme(function(theme) {
var defaultTheme = theme;
parameters.set('ui', defaultTheme);
});
drawioFrame.src = ApiConfig.httpSafeOrigin + '/components/drawio/src/main/webapp/index.html?'
+ parameters;
});
@ -203,18 +207,8 @@ define([
// starting the CryptPad framework
framework.start();
var loadDiagram = function () {
checkDefaultTheme(function(theme) {
var defaultTheme = theme;
parameters.set('ui', defaultTheme);
drawioFrame.src = ApiConfig.httpSafeOrigin + '/components/drawio/src/main/webapp/index.html?' + parameters;
});
};
window.addEventListener("message", (event) => {
if (event.data?.q === 'EV_METADATA_UPDATE') {
loadDiagram();
} else if (event.source === drawioFrame.contentWindow) {
if (event.source === drawioFrame.contentWindow) {
var data = JSON.parse(event.data);
var eventType = data.event;
var handler = drawioHandlers[eventType];