Skip to content

Commit 9201e58

Browse files
davidjgraphdavidjgraph
committed
24.2.5 release
1 parent 1211f81 commit 9201e58

File tree

22 files changed

+1981
-1896
lines changed

22 files changed

+1981
-1896
lines changed

‎ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
12-APR-2024: 24.2.5
2+
3+
- [conf cloud] Improves embedding from URL and CSV via proxy and confluence attachments [DID-11234]
4+
- Fixes possible DOM error in mxGraph.panGraph
5+
- Sorts files and folders in OneDrive picker [drawio-2870]
6+
- Checks size in Graph.clipSvgDataUri [drawio-desktop-1686]
7+
- Fixes C4 shape container names [drawio-4312]
8+
9+
10-APR-2024: 24.2.4
10+
11+
- Release skipped
12+
113
08-APR-2024: 24.2.3
214

315
- Adds Editor.fontSizeUnit, fixes possible unhandled font element

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.2.3
1+
24.2.5

‎src/main/mxgraph/util/mxUtils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ var mxUtils =
809809
*/
810810
htmlEntities: function(s, newline, quotes, tab)
811811
{
812-
s = String(s || '');
812+
s = String((s != null) ? s : '');
813813

814814
s = s.replace(/&/g,'&'); // 38 26
815815
s = s.replace(/</g,'&lt;'); // 60 3C

‎src/main/mxgraph/view/mxGraph.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8064,7 +8064,14 @@ mxGraph.prototype.panGraph = function(dx, dy)
80648064
// Inserts elements only if not empty
80658065
if (this.shiftPreview1.firstChild != null)
80668066
{
8067-
this.container.insertBefore(this.shiftPreview1, canvas.parentNode);
8067+
if (canvas.parentNode != null && canvas.parentNode.parentNode == this.container)
8068+
{
8069+
this.container.insertBefore(this.shiftPreview1, canvas.parentNode);
8070+
}
8071+
else
8072+
{
8073+
this.container.appendChild(this.shiftPreview1);
8074+
}
80688075
}
80698076

80708077
if (this.shiftPreview2.firstChild != null)

‎src/main/mxgraph/view/mxGraphView.js‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -770,25 +770,6 @@ mxGraphView.prototype.validateBackgroundImage = function()
770770
this.backgroundImage.dialect = this.graph.dialect;
771771
this.backgroundImage.init(this.backgroundPane);
772772
this.backgroundImage.redraw();
773-
774-
// Workaround for ignored event on background in IE8 standards mode
775-
if (document.documentMode == 8 && !mxClient.IS_EM)
776-
{
777-
mxEvent.addGestureListeners(this.backgroundImage.node,
778-
mxUtils.bind(this, function(evt)
779-
{
780-
this.graph.fireMouseEvent(mxEvent.MOUSE_DOWN, new mxMouseEvent(evt));
781-
}),
782-
mxUtils.bind(this, function(evt)
783-
{
784-
this.graph.fireMouseEvent(mxEvent.MOUSE_MOVE, new mxMouseEvent(evt));
785-
}),
786-
mxUtils.bind(this, function(evt)
787-
{
788-
this.graph.fireMouseEvent(mxEvent.MOUSE_UP, new mxMouseEvent(evt));
789-
})
790-
);
791-
}
792773
}
793774

794775
this.redrawBackgroundImage(this.backgroundImage, bg);

‎src/main/webapp/js/app.min.js‎

Lines changed: 594 additions & 592 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/js/diagramly/App.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,17 @@ App.main = function(callback, createUi)
640640
{
641641
return;
642642
}
643+
644+
// Checks if electron is defined in Electron app
645+
if (mxIsElectron && typeof electron === 'undefined')
646+
{
647+
alert('Runtime Environment not found.');
648+
document.body.innerHTML = '<div style="margin-top:10%;text-align:center;">' +
649+
'<img src="mxgraph/images/warning.png" align="top" style="padding-right:6px;"/>' +
650+
'Runtime Environment not found.</div>';
651+
652+
return;
653+
}
643654

644655
App.isMainCalled = true;
645656
// Handles uncaught errors before the app is loaded

‎src/main/webapp/js/diagramly/DriveClient.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,8 +1674,9 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
16741674
// Logs failed save
16751675
try
16761676
{
1677-
EditorUi.logError('Critical: Saving to Google Drive failed ' + file.desc.id,
1678-
null, 'from-' + head0 + '.' + mod0 + '-' + this.ui.hashValue(etag0) +
1677+
EditorUi.logError('Critical: Saving to Google Drive failed',
1678+
null, 'id-' + file.desc.id +
1679+
'-from-' + head0 + '.' + mod0 + '-' + this.ui.hashValue(etag0) +
16791680
'-to-' + resp.headRevisionId + '.' + resp.modifiedDate + '-' +
16801681
this.ui.hashValue(resp.etag) + ((temp.length > 0) ? '-errors-' + temp : ''),
16811682
'user-' + ((this.user != null) ? this.user.id : 'nouser') +

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9135,6 +9135,11 @@
91359135
}
91369136
};
91379137

9138+
if (!editorUi.isOffline())
9139+
{
9140+
buttons.appendChild(editorUi.createHelpIcon('https://www.drawio.com/doc/faq/print-diagram'));
9141+
}
9142+
91389143
var cancelBtn = mxUtils.button(mxResources.get('cancel'), function()
91399144
{
91409145
editorUi.hideDialog();
@@ -9146,32 +9151,35 @@
91469151
buttons.appendChild(cancelBtn);
91479152
}
91489153

9149-
if (!editorUi.isOffline())
9150-
{
9151-
var helpBtn = mxUtils.button(mxResources.get('help'), function()
9152-
{
9153-
graph.openLink('https://www.drawio.com/doc/faq/print-diagram');
9154-
});
9155-
9156-
helpBtn.className = 'geBtn';
9157-
buttons.appendChild(helpBtn);
9158-
}
9159-
91609154
if (PrintDialog.previewEnabled)
91619155
{
91629156
var previewBtn = mxUtils.button(mxResources.get('preview'), function()
91639157
{
9164-
editorUi.hideDialog();
9165-
preview(false);
9158+
try
9159+
{
9160+
preview(false);
9161+
editorUi.hideDialog();
9162+
}
9163+
catch (e)
9164+
{
9165+
editorUi.handleError(e);
9166+
}
91669167
});
91679168
previewBtn.className = 'geBtn';
91689169
buttons.appendChild(previewBtn);
91699170
}
91709171

91719172
var printBtn = mxUtils.button(mxResources.get((!PrintDialog.previewEnabled) ? 'ok' : 'print'), function()
91729173
{
9173-
editorUi.hideDialog();
9174-
preview(true);
9174+
try
9175+
{
9176+
preview(true);
9177+
editorUi.hideDialog();
9178+
}
9179+
catch (e)
9180+
{
9181+
editorUi.handleError(e);
9182+
}
91759183
});
91769184
printBtn.className = 'geBtn gePrimaryBtn';
91779185
buttons.appendChild(printBtn);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8448,7 +8448,7 @@
84488448
if (!this.doImportVisio && !this.loadingExtensions && !this.isOffline(true))
84498449
{
84508450
this.loadingExtensions = true;
8451-
mxscript('js/extensions.min.js', delayed, null, null, null, handleError);
8451+
mxscript(window.DRAWIO_SERVER_URL + 'js/extensions.min.js', delayed, null, null, null, handleError);
84528452
}
84538453
else
84548454
{
@@ -8513,7 +8513,7 @@
85138513
if (!this.doImportGraphML && !this.loadingExtensions && !this.isOffline(true))
85148514
{
85158515
this.loadingExtensions = true;
8516-
mxscript('js/extensions.min.js', delayed, null, null, null, handleError);
8516+
mxscript(window.DRAWIO_SERVER_URL + 'js/extensions.min.js', delayed, null, null, null, handleError);
85178517
}
85188518
else
85198519
{
@@ -8578,7 +8578,7 @@
85788578
if (typeof VsdxExport === 'undefined' && !this.loadingExtensions && !this.isOffline(true))
85798579
{
85808580
this.loadingExtensions = true;
8581-
mxscript('js/extensions.min.js', delayed, null, null, null, handleError);
8581+
mxscript(window.DRAWIO_SERVER_URL + 'js/extensions.min.js', delayed, null, null, null, handleError);
85828582
}
85838583
else
85848584
{
@@ -8709,7 +8709,7 @@
87098709
}
87108710
else
87118711
{
8712-
mxscript('js/extensions.min.js', delayed,
8712+
mxscript(window.DRAWIO_SERVER_URL + 'js/extensions.min.js', delayed,
87138713
null, null, null, handleError);
87148714
}
87158715
}
@@ -9061,7 +9061,7 @@
90619061
}
90629062
else
90639063
{
9064-
mxscript('js/extensions.min.js', delayed,
9064+
mxscript(window.DRAWIO_SERVER_URL + 'js/extensions.min.js', delayed,
90659065
null, null, null, onerror);
90669066
}
90679067
}
@@ -9756,7 +9756,7 @@
97569756
if (typeof JSZip === 'undefined' && !this.loadingExtensions && !this.isOffline(true))
97579757
{
97589758
this.loadingExtensions = true;
9759-
mxscript('js/extensions.min.js', delayed,
9759+
mxscript(window.DRAWIO_SERVER_URL + 'js/extensions.min.js', delayed,
97609760
null, null, null, onerror);
97619761
}
97629762
else
@@ -16959,7 +16959,7 @@
1695916959
}
1696016960
else
1696116961
{
16962-
mxscript('js/orgchart.min.js', onload, null, null, null, onerror);
16962+
mxscript(window.DRAWIO_SERVER_URL + 'js/orgchart.min.js', onload, null, null, null, onerror);
1696316963
}
1696416964
}
1696516965
}

0 commit comments

Comments
 (0)