Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
20.3.1 release
  • Loading branch information
davidjgraph committed Sep 15, 2022
1 parent 8f3f95a commit ea012ba
Show file tree
Hide file tree
Showing 27 changed files with 8,271 additions and 7,462 deletions.
12 changes: 12 additions & 0 deletions ChangeLog
@@ -1,3 +1,15 @@
15-SEP-2022: 20.3.1

- Multiple commits preparing for live UI switch [DS-909]
- Disables java proxy by default [DS-912]
- Removes click to stop drawing freehand [1109]
- NPE fix [DS-913]
- NPE fix [DS-914]
- [conf cloud] Diagram count restrictions on free tier [DFCC-57]
- Fixes scroll issue for CMD key in Safari 16 [3017]
- Enables autosize for multiple vertices [1116]
- Adds ui/safe to fix possible XSS in math [CSP-733]

07-SEP-2022: 20.3.0

- Uses organic as default layout to fix possible NPE in CSV import [DS-910]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
20.3.0
20.3.1
3,705 changes: 1,868 additions & 1,837 deletions src/main/webapp/js/app.min.js

Large diffs are not rendered by default.

147 changes: 129 additions & 18 deletions src/main/webapp/js/diagramly/App.js
Expand Up @@ -7080,20 +7080,7 @@ App.prototype.updateUserElement = function()
{
if (this.userElement == null)
{
this.userElement = document.createElement('a');
this.userElement.className = 'geItem';
this.userElement.style.position = 'absolute';
this.userElement.style.fontSize = '8pt';
this.userElement.style.top = (uiTheme == 'atlas') ? '8px' : '2px';
this.userElement.style.right = '30px';
this.userElement.style.margin = '4px';
this.userElement.style.padding = '2px';
this.userElement.style.paddingRight = '16px';
this.userElement.style.verticalAlign = 'middle';
this.userElement.style.backgroundImage = 'url(' + IMAGE_PATH + '/expanded.gif)';
this.userElement.style.backgroundPosition = '100% 60%';
this.userElement.style.backgroundRepeat = 'no-repeat';

this.userElement = this.createUserElement();
this.menubarContainer.appendChild(this.userElement);

// Prevents focus
Expand Down Expand Up @@ -7577,7 +7564,11 @@ App.prototype.updateUserElement = function()

if (file != null && file.isRealtimeEnabled() && file.isRealtimeSupported())
{
div = div.cloneNode(false);
var div = document.createElement('div');
div.style.padding = '10px';
div.style.whiteSpace = 'nowrap';
div.style.borderTop = '1px solid rgb(224, 224, 224)';
div.style.marginTop = '4px';
div.style.textAlign = 'center';
div.style.padding = '10px';
div.style.fontSize = '9pt';
Expand Down Expand Up @@ -7635,21 +7626,141 @@ App.prototype.updateUserElement = function()

if (user != null)
{
EditorUi.removeChildNodes(this.userElement);
this.userElement.innerText = '';
if (screen.width > 560)

if (Editor.currentTheme != 'sketch' && screen.width > 560)
{
mxUtils.write(this.userElement, user.displayName);
this.userElement.style.display = 'block';
this.userElement.style.display = 'inline-block';
}
}
else
{
this.userElement.style.display = 'none';
}
}

this.updateUserElementStyle();
this.updateUserElementIcon();
};

//TODO Use this function to get the currently logged in user
App.prototype.updateUserElementIcon = function()
{
var elt = this.userElement;

if (elt != null)
{
var title = mxResources.get('changeUser');

if (elt.style.display != 'none')
{
var file = this.getCurrentFile();

if (file != null && file.isRealtimeEnabled() && file.isRealtimeSupported())
{
var icon = document.createElement('img');
icon.setAttribute('border', '0');
icon.style.position = 'absolute';
icon.style.left = '16px';
icon.style.top = '2px';
icon.style.width = '12px';
icon.style.height = '12px';

var err = file.getRealtimeError();
var state = file.getRealtimeState();
title += ' (' + mxResources.get('realtimeCollaboration') + ': ';

if (state == 1)
{
icon.src = Editor.syncImage;
title += mxResources.get('online');
}
else
{
icon.src = Editor.syncProblemImage;

if (err != null && err.message != null)
{
title += err.message;
}
else
{
title += mxResources.get('disconnected');
}
}

title += ')';

if (Editor.currentTheme == 'sketch')
{
elt.style.marginRight = '6px';
elt.appendChild(icon);
}
}

elt.setAttribute('title', title);
}
}
};

//TODO Use this function to get the currently logged in user
App.prototype.updateUserElementStyle = function()
{
var elt = this.userElement;

if (elt != null)
{
if (Editor.currentTheme == 'sketch')
{
elt.className = 'geToolbarButton';
elt.style.backgroundImage = 'url(' + Editor.userImage + ')';
elt.style.backgroundPosition = 'center center';
elt.style.backgroundRepeat = 'no-repeat';
elt.style.backgroundSize = '100% 100%';
elt.style.position = 'relative';
elt.style.margin = '0px';
elt.style.padding = '0px';
elt.style.height = '24px';
elt.style.width = '24px';
elt.style.top = '3px';
elt.style.right = '';
}
else
{
elt.className = 'geItem';
elt.style.backgroundImage = 'url(' + IMAGE_PATH + '/expanded.gif)';
elt.style.backgroundPosition = '100% 60%';
elt.style.backgroundRepeat = 'no-repeat';
elt.style.backgroundSize = '';
elt.style.position = 'absolute';
elt.style.margin = '4px';
elt.style.padding = '2px';
elt.style.paddingRight = '16px';
elt.style.width = '';
elt.style.height = '';
elt.style.right = (Editor.currentTheme == 'atlas' ||
urlParams['live-ui'] != '1') ? '8px' : '30px';
elt.style.top = (Editor.currentTheme == 'atlas') ? '8px' : '2px';
}
}
};

/**
* Adds the listener for automatically saving the diagram for local changes.
*/
App.prototype.createUserElement = function()
{
var elt = document.createElement('a');
mxUtils.setPrefixedStyle(elt.style, 'transition', 'none');
elt.style.display = 'inline-block';
elt.style.cursor = 'pointer';
elt.style.fontSize = '8pt';

return elt;
};

//TODO Use this function to get the currently logged in user
App.prototype.getCurrentUser = function()
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/js/diagramly/Devel.js
Expand Up @@ -32,8 +32,8 @@ if (!mxIsElectron && location.protocol !== 'http:')
'; ';

var styleHashes = '\'sha256-JjkxVHHCCVO0nllPD6hU8bBYSlsikA8TM/o3fhr0bas=\' ' + // index.html
'\'sha256-4pUt7OuaoLNo5uDuX+AclpTryPwhRX6uqZWQH/jtOvE=\' ' + // Minimal.js/Light
'\'sha256-C26P0UwTt9j3PuMuqZ6wTb7DL6A9c0DoJcT8e2atugc=\' ' + // Minimal.js/Dark
'\'sha256-8bAFhdIVH8/EjuHhNVZCG8isp9LZEPSQ23SJ7e54VWI=\' ' + // Minimal.js/Light
'\'sha256-fSmyKEwMytIGzQ+V1A8gi8iNvdN+rLOrqJvCL179k8Q=\' ' + // Minimal.js/Dark
'\'sha256-7kY8ozVqKLIIBwZ24dhdmZkM26PsOlZmEi72RhmZKoM=\' ' + // mxTooltipHandler.js
'\'sha256-kuk5TvxZ/Kwuobo4g6uasb1xRQwr1+nfa1A3YGePO7U=\' ' + // MathJax
'\'sha256-ByOXYIXIkfNC3flUR/HoxR4Ak0pjOEF1q8XmtuIa6po=\' ' + // purify.min.js
Expand Down
9 changes: 8 additions & 1 deletion src/main/webapp/js/diagramly/Dialogs.js
Expand Up @@ -7695,8 +7695,15 @@ var FreehandWindow = function(editorUi, x, y, w, h, withBrush)
{
startBtn.innerText = '';
mxUtils.write(startBtn, mxResources.get(graph.freehand.isDrawing() ? 'stopDrawing' : 'startDrawing'));

var shortcut = document.createElement('span');
shortcut.style.opacity = '0.7';
shortcut.style['float'] = 'right';
mxUtils.write(shortcut, 'X');
startBtn.appendChild(shortcut);

startBtn.setAttribute('title', mxResources.get(graph.freehand.isDrawing() ? 'stopDrawing' : 'startDrawing'));
startBtn.className = 'geBtn' + (!graph.freehand.isDrawing() ? ' gePrimaryBtn' : '');
startBtn.className = 'geBtn' + (graph.freehand.isDrawing() ? ' gePrimaryBtn' : '');
}));

this.window.addListener('show', mxUtils.bind(this, function()
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/js/diagramly/Editor.js
Expand Up @@ -2388,7 +2388,7 @@
{
load: [(urlParams['math-output'] == 'html') ?
'output/chtml' : 'output/svg', 'input/tex',
'input/asciimath']
'input/asciimath', 'ui/safe']
},
startup:
{
Expand Down

0 comments on commit ea012ba

Please sign in to comment.