Skip to content

Commit

Permalink
19.0.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidjgraph
davidjgraph committed Jun 7, 2022
1 parent d92fd2c commit 3d3f819
Show file tree
Hide file tree
Showing 40 changed files with 430 additions and 427 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
View file
@@ -1,3 +1,9 @@
07-JUN-2022: 19.0.2

- Fixes isNode check, handling of HTML in node names
- Fixes cell value Element type check in mxCellCodec
- Changes mxStylesheetCodec.allowEval to false

06-JUN-2022: 19.0.1

- Fixes handling of cell ID in CSV import [DID-5225]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
@@ -1 +1 @@
19.0.1
19.0.2
2 changes: 1 addition & 1 deletion etc/dependencies/package.json
View file
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"jsZip": "3.10.1",
"perfect-freehand": "1.0.16",
"jquery": "3.3.1",
"jquery": "3.6.0",
"mermaid": "9.1.1",
"pako": "2.0.3",
"crypto-js": "3.1.2",
Expand Down
204 changes: 102 additions & 102 deletions src/main/webapp/js/app.min.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/main/webapp/js/diagramly/App.js
View file
Expand Up @@ -274,7 +274,7 @@ App.TRELLO_URL = 'https://api.trello.com/1/client.js';
/**
* Trello JQuery dependency
*/
App.TRELLO_JQUERY_URL = window.DRAWIO_BASE_URL + '/js/jquery/jquery-3.3.1.min.js';
App.TRELLO_JQUERY_URL = window.DRAWIO_BASE_URL + '/js/jquery/jquery-3.6.0.min.js';

/**
* Specifies the key for the pusher project.
Expand Down Expand Up @@ -6418,7 +6418,7 @@ App.prototype.descriptorChanged = function()
if (this.fname != null)
{
this.fnameWrapper.style.display = 'block';
this.fname.innerHTML = '';
this.fname.innerText = '';
var filename = (file.getTitle() != null) ? file.getTitle() : this.defaultFilename;
mxUtils.write(this.fname, filename);
this.fname.setAttribute('title', filename + ' - ' + mxResources.get('rename'));
Expand Down Expand Up @@ -7136,7 +7136,7 @@ App.prototype.updateUserElement = function()
else
{
var connected = false;
this.userPanel.innerHTML = '';
this.userPanel.innerText = '';

var img = document.createElement('img');

Expand Down Expand Up @@ -7693,7 +7693,7 @@ App.prototype.updateUserElement = function()

if (user != null)
{
this.userElement.innerHTML = '';
this.userElement.innerText = '';

if (screen.width > 560)
{
Expand Down
5 changes: 2 additions & 3 deletions src/main/webapp/js/diagramly/Devel.js
View file
Expand Up @@ -105,16 +105,15 @@ if (!mxIsElectron && location.protocol !== 'http:')
'worker-src https://se.diagrams.net/service-worker.js;'
console.log('se.diagrams.net:', se_diagrams_net);

// TODO remove https://ajax.googleapis.com April 2022. It's old jquery domain
var ac_draw_io = csp.replace(/%script-src%/g, 'https://aui-cdn.atlassian.com https://connect-cdn.atl-paas.net https://ajax.googleapis.com https://cdnjs.cloudflare.com').
var ac_draw_io = csp.replace(/%script-src%/g, 'https://aui-cdn.atlassian.com https://connect-cdn.atl-paas.net').
replace(/%frame-src%/g, 'https://www.lucidchart.com https://app.lucidchart.com https://lucid.app blob:').
replace(/%style-src%/g, 'https://aui-cdn.atlassian.com https://*.atlassian.net').
replace(/%connect-src%/g, '').
replace(/ /g, ' ') +
'worker-src https://ac.draw.io/service-worker.js;';
console.log('ac.draw.io:', ac_draw_io);

var aj_draw_io = csp.replace(/%script-src%/g, 'https://aui-cdn.atlassian.com https://cdnjs.cloudflare.com https://connect-cdn.atl-paas.net').
var aj_draw_io = csp.replace(/%script-src%/g, 'https://aui-cdn.atlassian.com https://connect-cdn.atl-paas.net').
replace(/%frame-src%/g, 'blob:').
replace(/%style-src%/g, 'https://aui-cdn.atlassian.com https://*.atlassian.net').
replace(/%connect-src%/g, 'https://api.atlassian.com https://api.media.atlassian.com').
Expand Down
62 changes: 31 additions & 31 deletions src/main/webapp/js/diagramly/Dialogs.js
View file
Expand Up @@ -2881,15 +2881,15 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
setActiveTab(0);

div.scrollTop = 0;
div.innerHTML = '';
div.innerText = '';
i0 = 0;

if (oldTemplates != templates)
{
templates = oldTemplates;
categories = origCategories;
customCatCount = origCustomCatCount;
list.innerHTML = '';
list.innerText = '';
initUi();
oldTemplates = null;
}
Expand All @@ -2912,7 +2912,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
}

div.scrollTop = 0;
div.innerHTML = '';
div.innerText = '';
spinner.spin(div);

var callback2 = function(docList, errorMsg, searchImportCats)
Expand All @@ -2938,13 +2938,13 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
}
else
{
div.innerHTML = '';
div.innerText = '';

if (importListsCount > 0)
{
list.style.display = '';
div.style.left = '160px';
list.innerHTML = '';
list.innerText = '';

customCatCount = 0;
categories = {'draw.io': docList};
Expand Down Expand Up @@ -3628,7 +3628,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
}

div.scrollTop = 0;
div.innerHTML = '';
div.innerText = '';
i0 = 0;
var msgDiv = document.createElement('div');
msgDiv.style.cssText = 'border: 1px solid #D3D3D3; padding: 6px; background: #F5F5F5;';
Expand Down Expand Up @@ -3704,7 +3704,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
currentEntry.style.backgroundColor = leftHighlight;

div.scrollTop = 0;
div.innerHTML = '';
div.innerText = '';
i0 = 0;

templates = customCats[cat2];
Expand Down Expand Up @@ -3749,7 +3749,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
currentEntry.style.backgroundColor = leftHighlight;

div.scrollTop = 0;
div.innerHTML = '';
div.innerText = '';
i0 = 0;

templates = subCat? subCategories[cat][subCat] : categories[cat];
Expand Down Expand Up @@ -5955,7 +5955,7 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
// Gets current state of page with given ID
var curr = currentDiagrams[diagrams[currentPage].getAttribute('id')];
mxUtils.setOpacity(compareBtn, 20);
errorNode.innerHTML = '';
errorNode.innerText = '';

if (curr == null)
{
Expand All @@ -5977,7 +5977,7 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
}, null, function()
{
mxUtils.setOpacity(compareBtn, 60);
errorNode.innerHTML = '';
errorNode.innerText = '';

if (container.style.display == 'none')
{
Expand Down Expand Up @@ -6232,14 +6232,14 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
function updateGraph(xml)
{
spinner.stop();
errorNode.innerHTML = '';
errorNode.innerText = '';
var doc = mxUtils.parseXml(xml);
var node = editorUi.editor.extractGraphModel(doc.documentElement, true);

if (node != null)
{
pageSelect.style.display = 'none';
pageSelect.innerHTML = '';
pageSelect.innerText = '';
currentDoc = doc;
currentXml = xml;
parseSelectFunction = null;
Expand Down Expand Up @@ -6343,7 +6343,7 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
shortUser = shortUser.substring(0, 20) + '...';
}

fileInfo.innerHTML = '';
fileInfo.innerText = '';
mxUtils.write(fileInfo, ((shortUser != null) ?
(shortUser + ' ') : '') + ts.toLocaleDateString() +
' ' + ts.toLocaleTimeString());
Expand Down Expand Up @@ -6376,8 +6376,8 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
else
{
pageSelect.style.display = 'none';
pageSelect.innerHTML = '';
fileInfo.innerHTML = '';
pageSelect.innerText = '';
fileInfo.innerText = '';
mxUtils.write(fileInfo, mxResources.get('errorLoadingFile'));
mxUtils.write(errorNode, mxResources.get('errorLoadingFile'));
}
Expand All @@ -6403,7 +6403,7 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
fileInfo.removeAttribute('title');
fileInfo.innerHTML = mxUtils.htmlEntities(mxResources.get('loading') + '...');
container.style.backgroundColor = graph.defaultPageBackgroundColor;
errorNode.innerHTML = '';
errorNode.innerText = '';
graph.getModel().clear();

restoreBtn.setAttribute('disabled', 'disabled');
Expand Down Expand Up @@ -6444,8 +6444,8 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
{
spinner.stop();
pageSelect.style.display = 'none';
pageSelect.innerHTML = '';
fileInfo.innerHTML = '';
pageSelect.innerText = '';
fileInfo.innerText = '';
mxUtils.write(fileInfo, mxResources.get('errorLoadingFile'));
mxUtils.write(errorNode, mxResources.get('errorLoadingFile'));
});
Expand Down Expand Up @@ -6822,7 +6822,7 @@ var DraftDialog = function(editorUi, title, xml, editFn, discardFn, editLabel, d
parseDiagram(diagrams[currentPage]);
}

pageSelect.innerHTML = '';
pageSelect.innerText = '';

if (diagrams.length > 1)
{
Expand Down Expand Up @@ -7043,7 +7043,7 @@ var FindWindow = function(ui, x, y, w, h, withReplace)

function search(internalCall, trySameCell, stayOnPage)
{
replAllNotif.innerHTML = '';
replAllNotif.innerText = '';
var cells = graph.model.getDescendants(graph.model.getRoot());
var searchStr = searchInput.value.toLowerCase();
var re = (regexInput.checked) ? new RegExp(searchStr) : null;
Expand Down Expand Up @@ -7249,7 +7249,7 @@ var FindWindow = function(ui, x, y, w, h, withReplace)

var resetBtn = mxUtils.button(mxResources.get('reset'), function()
{
replAllNotif.innerHTML = '';
replAllNotif.innerText = '';
searchInput.value = '';
searchInput.style.backgroundColor = '';

Expand Down Expand Up @@ -7444,7 +7444,7 @@ var FindWindow = function(ui, x, y, w, h, withReplace)

var replaceAllBtn = mxUtils.button(mxResources.get('replaceAll'), function()
{
replAllNotif.innerHTML = '';
replAllNotif.innerText = '';

if (replaceInput.value)
{
Expand Down Expand Up @@ -7727,7 +7727,7 @@ var FreehandWindow = function(editorUi, x, y, w, h, withBrush)

graph.addListener('freehandStateChanged', mxUtils.bind(this, function()
{
startBtn.innerHTML = '';
startBtn.innerText = '';
mxUtils.write(startBtn, mxResources.get(graph.freehand.isDrawing() ? 'stopDrawing' : 'startDrawing'));
startBtn.setAttribute('title', mxResources.get(graph.freehand.isDrawing() ? 'stopDrawing' : 'startDrawing'));
startBtn.className = 'geBtn' + (!graph.freehand.isDrawing() ? ' gePrimaryBtn' : '');
Expand Down Expand Up @@ -8072,7 +8072,7 @@ var MoreShapesDialog = function(editorUi, expanded, entries)
preview.style.textAlign = 'center';
preview.style.padding = '0px';
preview.style.color = '';
preview.innerHTML = '';
preview.innerText = '';

if (entry.desc != null)
{
Expand Down Expand Up @@ -8474,7 +8474,7 @@ var PluginsDialog = function(editorUi, addFn, delFn, closeOnly)
}
else
{
inner.innerHTML = '';
inner.innerText = '';

for (var i = 0; i < plugins.length; i++)
{
Expand Down Expand Up @@ -9580,7 +9580,7 @@ var LibraryDialog = function(editorUi, name, library, initialImages, file, mode)

function updateLabel()
{
label.innerHTML = '';
label.innerText = '';
label.style.cursor = 'pointer';
label.style.whiteSpace = 'nowrap';
label.style.textOverflow = 'ellipsis';
Expand Down Expand Up @@ -9636,7 +9636,7 @@ var LibraryDialog = function(editorUi, name, library, initialImages, file, mode)

if (entry.title == null || entry.title.length == 0)
{
label.innerHTML = '';
label.innerText = '';
}

label.style.textOverflow = '';
Expand Down Expand Up @@ -10934,7 +10934,7 @@ var TemplatesDialog = function(editorUi, callback, cancelCallback,

if (!internalCall)
{
diagramsTiles.innerHTML = '';
diagramsTiles.innerText = '';
swapActiveItem();
curDiagList = diagrams;
curSearchImportCats = searchImportCats;
Expand Down Expand Up @@ -11651,7 +11651,7 @@ var TemplatesDialog = function(editorUi, callback, cancelCallback,
if (recentDocsCallback)
{
tempDlgContent.scrollTop = 0;
diagramsTiles.innerHTML = '';
diagramsTiles.innerText = '';
spinner.spin(diagramsTiles);
cancelPendingCall = false;
callInitiated = true;
Expand Down Expand Up @@ -11796,7 +11796,7 @@ var TemplatesDialog = function(editorUi, callback, cancelCallback,

deselectTempCat();
tempDlgContent.scrollTop = 0;
diagramsTiles.innerHTML = '';
diagramsTiles.innerText = '';
diagramsListTitle.innerHTML = mxUtils.htmlEntities(mxResources.get('searchResults')) +
' "' + mxUtils.htmlEntities(searchStr) + '"';
delayTimer = null;
Expand Down Expand Up @@ -12499,7 +12499,7 @@ AspectDialog.prototype.createPageItem = function(pageId, pageName, pageNode)
this.selectedItem = $listItem;
this.selectedPage = pageId;
$listItem.className += ' geAspectDlgListItemSelected';
this.layersContainer.innerHTML = '';
this.layersContainer.innerText = '';
this.selectedLayers = {};
this.okBtn.setAttribute('disabled', 'disabled');

Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/js/diagramly/Editor.js
View file
Expand Up @@ -5422,7 +5422,7 @@
picker.appendChild(btn);
});

picker.innerHTML = '';
picker.innerText = '';

for (var i = 0; i < colorsets.length; i++)
{
Expand Down Expand Up @@ -6056,7 +6056,7 @@

function refreshTags(tags, selected)
{
tagCloud.innerHTML = '';
tagCloud.innerText = '';

if (tags.length > 0)
{
Expand Down

0 comments on commit 3d3f819

Please sign in to comment.