Skip to content

Commit

Permalink
24.6.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjgraph committed Jun 26, 2024
1 parent aa18279 commit c706924
Show file tree
Hide file tree
Showing 79 changed files with 1,031 additions and 942 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
25-JUN-2024: 24.6.3

- Removes drop shadow in PDF export [jgraph/drawio-desktop#1784]
- Conf Cloud: Added support for copied pages in Gliffy import [DID-11864]
- Conf Cloud: Added support for inplaceEdits configuration [DID-11923]
- Removes uponSanitizeAttribute listener for SVG content attribute [DND-1208]

22-JUN-2024: 24.6.2

- Adds option to include current page in PNG and SVG export [jgraph/drawio#2860]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.6.2
24.6.3
3 changes: 3 additions & 0 deletions src/main/webapp/export3.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
page-break-inside: avoid;
page-break-after: always;
}
g[style*="filter: drop-shadow("] {
filter: none !important;
}
}
</style>
<link rel="stylesheet" href="mxgraph/css/common.css" charset="UTF-8" type="text/css">
Expand Down
540 changes: 270 additions & 270 deletions src/main/webapp/js/app.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/webapp/js/diagramly/Dialogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3063,7 +3063,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
var wh = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;

// TODO: Use maxscreensize
editorUi.sidebar.createTooltip(elt, cells, Math.min(ww - 80, 1000), Math.min(wh - 80, 800),
editorUi.sidebar.createTooltip(elt, cells, Math.min(ww - 120, 1000), Math.min(wh - 120, 800),
(title != null) ? mxResources.get(title) : null,
true, new mxPoint(x, y), true, function()
{
Expand Down
24 changes: 23 additions & 1 deletion src/main/webapp/js/diagramly/EditorUi.js
Original file line number Diff line number Diff line change
Expand Up @@ -11772,7 +11772,6 @@
}), false);
}

graph.enableFlowAnimation = Editor.enableAnimations;
this.initPages();

// Embedded mode
Expand Down Expand Up @@ -11936,6 +11935,15 @@

this.installSettings();

// Animations
this.addListener('enableAnimationsChanged', mxUtils.bind(this, function(sender, evt)
{
graph.enableFlowAnimation = Editor.enableAnimations;
graph.refresh();
}));

graph.enableFlowAnimation = Editor.enableAnimations;

if (screen.width <= Editor.smallScreenWidth)
{
this.formatWidth = 0;
Expand Down Expand Up @@ -14458,6 +14466,20 @@
mxSettings.save();
}));

/**
* Persists animations switch.
*/
if (mxSettings.settings.enableAnimations != null)
{
Editor.enableAnimations = mxSettings.settings.enableAnimations;
}

this.addListener('enableAnimationsChanged', mxUtils.bind(this, function(sender, evt)
{
mxSettings.settings.enableAnimations = Editor.enableAnimations;
mxSettings.save();
}));

/**
* Persists autosave switch in Chrome app.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/js/diagramly/Menus.js
Original file line number Diff line number Diff line change
Expand Up @@ -4629,7 +4629,7 @@

editorUi.menus.addSubmenu('units', menu, parent);
editorUi.menus.addMenuItems(menu, ['-', 'copyConnect',
'collapseExpand', 'tooltips', 'toggleReadOnly', '-'], parent);
'collapseExpand', 'tooltips', '-'], parent);

var file = editorUi.getCurrentFile();

Expand Down
8 changes: 8 additions & 0 deletions src/main/webapp/js/grapheditor/Actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,14 @@ Actions.prototype.init = function()
action.setSelectedCallback(function() { return graph.graphHandler.guidesEnabled; });
action.setEnabled(false);

action = this.addAction('animations', function()
{
Editor.enableAnimations = !Editor.enableAnimations;
ui.fireEvent(new mxEventObject('enableAnimationsChanged'));
});
action.setToggleAction(true);
action.setSelectedCallback(function() { return Editor.enableAnimations; });

action = this.addAction('tooltips', function()
{
graph.tooltipHandler.setEnabled(!graph.tooltipHandler.isEnabled());
Expand Down
9 changes: 5 additions & 4 deletions src/main/webapp/js/grapheditor/EditorUi.js
Original file line number Diff line number Diff line change
Expand Up @@ -6474,10 +6474,11 @@ EditorUi.prototype.createKeyHandler = function(editor)
// US keycodes for + is 61 and - is 173. Keypad + is 107 and - is 109.
keyHandler.bindAction(107, true, 'zoomIn'); // Ctrl+Plus (Numpad)
keyHandler.bindAction(109, true, 'zoomOut'); // Ctrl+Minus (Numpad)
keyHandler.bindAction(61, true, 'zoomIn'); // Ctrl + (US)
keyHandler.bindAction(222, true, 'zoomIn'); // Ctrl Minus (CH: '/?)
keyHandler.bindAction(173, true, 'zoomOut'); // Ctrl - (US)
keyHandler.bindAction(189, true, 'zoomOut'); // Ctrl Slash (CH: -/_)
keyHandler.bindAction(61, true, 'zoomIn'); // Ctrl + tested by DB, firefox only.
keyHandler.bindAction(187, true, 'zoomIn'); // Ctrl + (US) tested by DB, chrome and desktop
keyHandler.bindAction(222, true, 'zoomIn'); // Ctrl Minus (CH: '/?) tested by GA, CH keyboard
keyHandler.bindAction(173, true, 'zoomOut'); // Ctrl - (US) tested by DB, firefox only.
keyHandler.bindAction(189, true, 'zoomOut'); // Ctrl Slash (CH: -/_) tested by DB, chrome and desktop

if (!this.editor.chromeless || this.editor.editable)
{
Expand Down
11 changes: 0 additions & 11 deletions src/main/webapp/js/grapheditor/Graph.js
Original file line number Diff line number Diff line change
Expand Up @@ -2440,17 +2440,6 @@ DOMPurify.addHook('afterSanitizeAttributes', function(node)
}
});

// Workaround for removed content with empty nodes
DOMPurify.addHook('uponSanitizeAttribute', function (node, evt)
{
if (node.nodeName == 'svg' && evt.attrName == 'content')
{
evt.forceKeepAttr = true;
}

return node;
});

/**
* Sanitizes the given value.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/js/grapheditor/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Sidebar.prototype.expandedImage = (!mxClient.IS_SVG) ? IMAGE_PATH + '/expanded.g
Sidebar.prototype.enableTooltips = true;

/**
* Specifies the delay for the tooltip. Default is 16 px.
* Specifies the border for the tooltip. Default is 16 px.
*/
Sidebar.prototype.tooltipBorder = 16;

Expand Down Expand Up @@ -704,7 +704,7 @@ Sidebar.prototype.createTooltip = function(elt, cells, w, h, title, showLabel, o
this.tooltip.style.left = left + 'px';
this.tooltip.style.top = top + 'px';

mxUtils.fit(this.tooltip);
mxUtils.fit(this.tooltip, this.tooltipBorder);
this.lastCreated = Date.now();
};

Expand Down
Loading

0 comments on commit c706924

Please sign in to comment.