Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/jgraph/drawio into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Dec 30, 2023
2 parents 2c6f54d + 37a1bc3 commit 5f14ee1
Show file tree
Hide file tree
Showing 14 changed files with 2,131 additions and 2,104 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
29-DEC-2023: 21.1.16

- Adds simple theme to atlas.min.js

27-DEC-2023: 21.1.15

- Fixes NPE of undefined function emfDone [drawio-4072]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.1.15
22.1.16
2 changes: 1 addition & 1 deletion etc/build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@
<delete file="${basedir}/.tmp0.js"/>
</target>

<target name="all" depends="app, integrate">
<target name="all" depends="integrate">
<delete file="${war.dir}/js/atlas-viewer.min.js"/>
<delete file="${war.dir}/js/atlas.min.js"/>
</target>
Expand Down
1,686 changes: 843 additions & 843 deletions src/main/webapp/js/app.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/main/webapp/js/diagramly/EditorUi.js
Original file line number Diff line number Diff line change
Expand Up @@ -2176,7 +2176,7 @@
null, !Editor.defaultCompressed, format == 'pdf');
var from = null, to = null, allPages = null;

if (bounds.width * bounds.height > MAX_AREA || data.length > MAX_REQUEST_SIZE)
if (!EditorUi.isElectronApp && (bounds.width * bounds.height > MAX_AREA || data.length > MAX_REQUEST_SIZE))
{
throw {message: mxResources.get('drawingTooLarge')};
}
Expand Down Expand Up @@ -5093,7 +5093,7 @@
var dlg = new SaveDialog(this, filename, mxUtils.bind(this, function(input, mode, folderId)
{
saveFunction(input.value, mode, input, folderId);
this.hideDialog();
this.hideDialog(null, null, dlg.container);
}), disabled, data, mimeType, base64Encoded);

this.showDialog(dlg.container, 420, 110, true, false, mxUtils.bind(this, function()
Expand Down Expand Up @@ -5546,7 +5546,7 @@
var dlg = new SaveDialog(this, filename, mxUtils.bind(this, function(input, mode, folderId)
{
saveFunction(input.value, mode, input, folderId);
this.hideDialog();
this.hideDialog(null, null, dlg.container);
}), disabled, null, 'application/pdf');

this.showDialog(dlg.container, 420, 110, true, false, mxUtils.bind(this, function()
Expand Down
3 changes: 3 additions & 0 deletions src/main/webapp/js/diagramly/ElectronApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -1624,6 +1624,9 @@ mxStencilRegistry.allowEval = false;

LocalFile.prototype.saveDraft = function()
{
// Save draft only if file is not saved (prevents creating draft file after actual file is saved)
if (!this.isModified()) return;

if (this.fileObject == null)
{
//Use indexed db for unsaved files
Expand Down
22 changes: 21 additions & 1 deletion src/main/webapp/js/export.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,27 @@ function render(data)
bg = null;
}

var svgRoot = graph.getSvg(bg, expScale, 0, false, null, true, null, null, null);
if (data.theme == 'dark')
{
// TODO Support enableCssDarkMode?
graph.shapeForegroundColor = Editor.lightColor;
graph.shapeBackgroundColor = Editor.darkColor;
graph.stylesheet = graph.getDefaultStylesheet();
graph.refresh();
}

var linkTarget = null;

if (data.linkTarget == 'same-win')
{
linkTarget = '_top';
}
else if (data.linkTarget == 'new-win')
{
linkTarget = '_blank';
}

var svgRoot = graph.getSvg(bg, expScale, 0, false, null, true, null, null, linkTarget);

if (graph.shadowVisible)
{
Expand Down
1,390 changes: 695 additions & 695 deletions src/main/webapp/js/integrate.min.js

Large diffs are not rendered by default.

556 changes: 278 additions & 278 deletions src/main/webapp/js/viewer-static.min.js

Large diffs are not rendered by default.

556 changes: 278 additions & 278 deletions src/main/webapp/js/viewer.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/webapp/mxgraph/mxClient.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/webapp/resources/dia_it.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ millimeters=Millimetri
confEditDraftDelOrExt=Questo diagramma si trova in una pagina di bozza, viene eliminato dalla pagina o viene modificato esternamente. Sarà salvato come una nuova versione dell'allegato e potrebbe non essere riportato nella pagina.
confDiagEditedExt=Il diagramma è modificato in un'altra sessione. Sarà salvato come una nuova versione dell'allegato, ma la pagina mostrerà le modifiche di altre sessioni.
macroNotFound=Macro non trovata
confAInvalidPageIdsFormat=Formato file IDS di pagina errata
confAInvalidPageIdsFormat=Formato file di ID page errato
confACollectingCurPages=Raccolta delle pagine attuali
confABuildingPagesMap=Creazione della mappa delle pagine
confAProcessDrawDiag=Iniziata l'elaborazione dei diagrammi importati di draw.io
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/service-worker.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/webapp/service-worker.js.map

Large diffs are not rendered by default.

1 comment on commit 5f14ee1

@vercel
Copy link

@vercel vercel bot commented on 5f14ee1 Dec 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

drawio – ./

drawio-git-dev-louyongjiu.vercel.app
drawio-louyongjiu.vercel.app
drawio.nines.center

Please sign in to comment.