Skip to content

Commit 34466eb

Browse files
committed
29.2.7 release
1 parent 5d9571b commit 34466eb

File tree

12 files changed

+1144
-1150
lines changed

12 files changed

+1144
-1150
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
10-DEC-2025: 29.2.7
2+
3+
- Reverts edit icon for local .html files [jgraph/drawio#5375]
4+
15
08-DEC-2025: 29.2.6
26

37
- Changes edit icon naming clash caused by [jgraph/drawio#5375]

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
29.2.6
1+
29.2.7

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

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

src/main/webapp/js/diagramly/Dialogs.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -795,13 +795,13 @@ var EmbedDialog = function(editorUi, result, timeout, ignoreSize, previewFn, tit
795795
}
796796

797797
var downloadBtn = mxUtils.button(mxResources.get('export'), function()
798-
{
799-
editorUi.hideDialog();
800-
editorUi.saveData((filename != null) ? filename : 'embed.txt', 'txt', result, 'text/plain');
801-
});
802-
803-
downloadBtn.className = 'geBtn';
804-
buttons.appendChild(downloadBtn);
798+
{
799+
editorUi.hideDialog();
800+
editorUi.saveData((filename != null) ? filename : 'embed.txt', 'txt', result, 'text/plain');
801+
});
802+
803+
downloadBtn.className = 'geBtn';
804+
buttons.appendChild(downloadBtn);
805805

806806
if (!editorUi.isOffline() && result.length < maxSize)
807807
{

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

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,9 +1454,7 @@
14541454
// Writes the file as an embedded HTML file
14551455
if (!forceSvg && !forceXml && (forceHtml || (file != null && /(\.html)$/i.test(file.getTitle()))))
14561456
{
1457-
xml = this.getHtml2(mxUtils.getXml(fileNode), graph, (file != null) ? file.getTitle() : null,
1458-
editLink, redirect, redirect == null && !EditorUi.isElectronApp &&
1459-
this.getServiceName() == 'draw.io');
1457+
xml = this.getHtml2(mxUtils.getXml(fileNode), graph, (file != null) ? file.getTitle() : null, editLink, redirect);
14601458
}
14611459
// Maps the XML data to the content attribute in the SVG node
14621460
else if (forceSvg || (!forceXml && file != null && /(\.svg)$/i.test(file.getTitle())))
@@ -2018,23 +2016,19 @@
20182016
/**
20192017
* Same as above but using the new embed code.
20202018
*/
2021-
EditorUi.prototype.getHtml2 = function(xml, graph, title, editLink, redirect, addEditLink)
2019+
EditorUi.prototype.getHtml2 = function(xml, graph, title, editLink, redirect)
20222020
{
20232021
var js = window.DRAWIO_VIEWER_URL || EditorUi.drawHost + '/js/viewer-static.min.js';
2024-
var data = {highlight: '#0000ff', nav: this.editor.graph.foldingEnabled, resize: true,
2025-
xml: Graph.zapGremlins(xml), toolbar: 'pages zoom layers lightbox'};
2026-
2022+
20272023
// Makes XHTML compatible
20282024
if (redirect != null)
20292025
{
20302026
redirect = redirect.replace(/&/g, '&amp;');
20312027
}
2032-
else if (addEditLink)
2033-
{
2034-
data.editor = window.DRAWIO_BASE_URL;
2035-
data.toolbar += ' editlocal';
2036-
}
2037-
2028+
2029+
var data = {highlight: '#0000ff', nav: this.editor.graph.foldingEnabled, resize: true,
2030+
xml: Graph.zapGremlins(xml), toolbar: 'pages zoom layers lightbox'};
2031+
20382032
if (this.pages != null && this.currentPage != null)
20392033
{
20402034
data.page = mxUtils.indexOf(this.pages, this.currentPage);
@@ -5108,6 +5102,23 @@
51085102
new Blob([data], {type: mimeType})
51095103
navigator.msSaveOrOpenBlob(blob, filename);
51105104
}
5105+
// Older versions of IE (binary not supported)
5106+
else if (mxClient.IS_IE)
5107+
{
5108+
var win = window.open('about:blank', '_blank');
5109+
5110+
if (win == null)
5111+
{
5112+
mxUtils.popup(data, true);
5113+
}
5114+
else
5115+
{
5116+
win.document.write(data);
5117+
win.document.close();
5118+
win.document.execCommand('SaveAs', true, filename);
5119+
win.close();
5120+
}
5121+
}
51115122
else if (mxClient.IS_IOS && this.isOffline())
51125123
{
51135124
// Workaround for "WebKitBlobResource error 1" in mobile Safari

src/main/webapp/js/diagramly/GraphViewer.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ GraphViewer.prototype.init = function(container, xmlNode, graphConfig)
153153
this.layersEnabled = mxUtils.indexOf(this.toolbarItems, 'layers') >= 0;
154154
this.tagsEnabled = mxUtils.indexOf(this.toolbarItems, 'tags') >= 0;
155155
this.lightboxEnabled = mxUtils.indexOf(this.toolbarItems, 'lightbox') >= 0;
156-
this.editEnabled = mxUtils.indexOf(this.toolbarItems, 'editlocal') >= 0;
157156
this.lightboxClickEnabled = this.graphConfig.lightbox != false;
158157
this.initialOverflow = document.body.style.overflow;
159158
this.initialWidth = (container != null) ? container.style.width : null;
@@ -1722,24 +1721,6 @@ GraphViewer.prototype.addToolbar = function()
17221721
}), Editor.fullscreenImage, (mxResources.get('fullscreen') || 'Fullscreen'));
17231722
}
17241723
}
1725-
else if (token == 'editlocal')
1726-
{
1727-
if (this.editEnabled && this.graphConfig.editor != null)
1728-
{
1729-
addButton(mxUtils.bind(this, function()
1730-
{
1731-
try
1732-
{
1733-
window.location.href = this.graphConfig.editor + '#R' +
1734-
encodeURIComponent(this.xml);
1735-
}
1736-
catch (e)
1737-
{
1738-
alert(e.message);
1739-
}
1740-
}), Editor.editImage, (mxResources.get('edit') || 'Edit'));
1741-
}
1742-
}
17431724
else if (this.graphConfig['toolbar-buttons'] != null)
17441725
{
17451726
var def = this.graphConfig['toolbar-buttons'][token];

src/main/webapp/js/integrate.min.js

Lines changed: 761 additions & 761 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)