Skip to content

Commit 3d3f819

Browse files
davidjgraphdavidjgraph
committed
19.0.2 release
1 parent d92fd2c commit 3d3f819

40 files changed

+430
-427
lines changed

‎ChangeLog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
07-JUN-2022: 19.0.2
2+
3+
- Fixes isNode check, handling of HTML in node names
4+
- Fixes cell value Element type check in mxCellCodec
5+
- Changes mxStylesheetCodec.allowEval to false
6+
17
06-JUN-2022: 19.0.1
28

39
- Fixes handling of cell ID in CSV import [DID-5225]

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.0.1
1+
19.0.2

‎etc/dependencies/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"jsZip": "3.10.1",
1313
"perfect-freehand": "1.0.16",
14-
"jquery": "3.3.1",
14+
"jquery": "3.6.0",
1515
"mermaid": "9.1.1",
1616
"pako": "2.0.3",
1717
"crypto-js": "3.1.2",

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

+102-102
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/js/diagramly/App.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ App.TRELLO_URL = 'https://api.trello.com/1/client.js';
274274
/**
275275
* Trello JQuery dependency
276276
*/
277-
App.TRELLO_JQUERY_URL = window.DRAWIO_BASE_URL + '/js/jquery/jquery-3.3.1.min.js';
277+
App.TRELLO_JQUERY_URL = window.DRAWIO_BASE_URL + '/js/jquery/jquery-3.6.0.min.js';
278278

279279
/**
280280
* Specifies the key for the pusher project.
@@ -6418,7 +6418,7 @@ App.prototype.descriptorChanged = function()
64186418
if (this.fname != null)
64196419
{
64206420
this.fnameWrapper.style.display = 'block';
6421-
this.fname.innerHTML = '';
6421+
this.fname.innerText = '';
64226422
var filename = (file.getTitle() != null) ? file.getTitle() : this.defaultFilename;
64236423
mxUtils.write(this.fname, filename);
64246424
this.fname.setAttribute('title', filename + ' - ' + mxResources.get('rename'));
@@ -7136,7 +7136,7 @@ App.prototype.updateUserElement = function()
71367136
else
71377137
{
71387138
var connected = false;
7139-
this.userPanel.innerHTML = '';
7139+
this.userPanel.innerText = '';
71407140

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

@@ -7693,7 +7693,7 @@ App.prototype.updateUserElement = function()
76937693

76947694
if (user != null)
76957695
{
7696-
this.userElement.innerHTML = '';
7696+
this.userElement.innerText = '';
76977697

76987698
if (screen.width > 560)
76997699
{

‎src/main/webapp/js/diagramly/Devel.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,15 @@ if (!mxIsElectron && location.protocol !== 'http:')
105105
'worker-src https://se.diagrams.net/service-worker.js;'
106106
console.log('se.diagrams.net:', se_diagrams_net);
107107

108-
// TODO remove https://ajax.googleapis.com April 2022. It's old jquery domain
109-
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').
108+
var ac_draw_io = csp.replace(/%script-src%/g, 'https://aui-cdn.atlassian.com https://connect-cdn.atl-paas.net').
110109
replace(/%frame-src%/g, 'https://www.lucidchart.com https://app.lucidchart.com https://lucid.app blob:').
111110
replace(/%style-src%/g, 'https://aui-cdn.atlassian.com https://*.atlassian.net').
112111
replace(/%connect-src%/g, '').
113112
replace(/ /g, ' ') +
114113
'worker-src https://ac.draw.io/service-worker.js;';
115114
console.log('ac.draw.io:', ac_draw_io);
116115

117-
var aj_draw_io = csp.replace(/%script-src%/g, 'https://aui-cdn.atlassian.com https://cdnjs.cloudflare.com https://connect-cdn.atl-paas.net').
116+
var aj_draw_io = csp.replace(/%script-src%/g, 'https://aui-cdn.atlassian.com https://connect-cdn.atl-paas.net').
118117
replace(/%frame-src%/g, 'blob:').
119118
replace(/%style-src%/g, 'https://aui-cdn.atlassian.com https://*.atlassian.net').
120119
replace(/%connect-src%/g, 'https://api.atlassian.com https://api.media.atlassian.com').

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

+31-31
Original file line numberDiff line numberDiff line change
@@ -2881,15 +2881,15 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
28812881
setActiveTab(0);
28822882

28832883
div.scrollTop = 0;
2884-
div.innerHTML = '';
2884+
div.innerText = '';
28852885
i0 = 0;
28862886

28872887
if (oldTemplates != templates)
28882888
{
28892889
templates = oldTemplates;
28902890
categories = origCategories;
28912891
customCatCount = origCustomCatCount;
2892-
list.innerHTML = '';
2892+
list.innerText = '';
28932893
initUi();
28942894
oldTemplates = null;
28952895
}
@@ -2912,7 +2912,7 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
29122912
}
29132913

29142914
div.scrollTop = 0;
2915-
div.innerHTML = '';
2915+
div.innerText = '';
29162916
spinner.spin(div);
29172917

29182918
var callback2 = function(docList, errorMsg, searchImportCats)
@@ -2938,13 +2938,13 @@ var NewDialog = function(editorUi, compact, showName, callback, createOnly, canc
29382938
}
29392939
else
29402940
{
2941-
div.innerHTML = '';
2941+
div.innerText = '';
29422942

29432943
if (importListsCount > 0)
29442944
{
29452945
list.style.display = '';
29462946
div.style.left = '160px';
2947-
list.innerHTML = '';
2947+
list.innerText = '';
29482948

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

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

37063706
div.scrollTop = 0;
3707-
div.innerHTML = '';
3707+
div.innerText = '';
37083708
i0 = 0;
37093709

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

37513751
div.scrollTop = 0;
3752-
div.innerHTML = '';
3752+
div.innerText = '';
37533753
i0 = 0;
37543754

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

59605960
if (curr == null)
59615961
{
@@ -5977,7 +5977,7 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
59775977
}, null, function()
59785978
{
59795979
mxUtils.setOpacity(compareBtn, 60);
5980-
errorNode.innerHTML = '';
5980+
errorNode.innerText = '';
59815981

59825982
if (container.style.display == 'none')
59835983
{
@@ -6232,14 +6232,14 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
62326232
function updateGraph(xml)
62336233
{
62346234
spinner.stop();
6235-
errorNode.innerHTML = '';
6235+
errorNode.innerText = '';
62366236
var doc = mxUtils.parseXml(xml);
62376237
var node = editorUi.editor.extractGraphModel(doc.documentElement, true);
62386238

62396239
if (node != null)
62406240
{
62416241
pageSelect.style.display = 'none';
6242-
pageSelect.innerHTML = '';
6242+
pageSelect.innerText = '';
62436243
currentDoc = doc;
62446244
currentXml = xml;
62456245
parseSelectFunction = null;
@@ -6343,7 +6343,7 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
63436343
shortUser = shortUser.substring(0, 20) + '...';
63446344
}
63456345

6346-
fileInfo.innerHTML = '';
6346+
fileInfo.innerText = '';
63476347
mxUtils.write(fileInfo, ((shortUser != null) ?
63486348
(shortUser + ' ') : '') + ts.toLocaleDateString() +
63496349
' ' + ts.toLocaleTimeString());
@@ -6376,8 +6376,8 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
63766376
else
63776377
{
63786378
pageSelect.style.display = 'none';
6379-
pageSelect.innerHTML = '';
6380-
fileInfo.innerHTML = '';
6379+
pageSelect.innerText = '';
6380+
fileInfo.innerText = '';
63816381
mxUtils.write(fileInfo, mxResources.get('errorLoadingFile'));
63826382
mxUtils.write(errorNode, mxResources.get('errorLoadingFile'));
63836383
}
@@ -6403,7 +6403,7 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
64036403
fileInfo.removeAttribute('title');
64046404
fileInfo.innerHTML = mxUtils.htmlEntities(mxResources.get('loading') + '...');
64056405
container.style.backgroundColor = graph.defaultPageBackgroundColor;
6406-
errorNode.innerHTML = '';
6406+
errorNode.innerText = '';
64076407
graph.getModel().clear();
64086408

64096409
restoreBtn.setAttribute('disabled', 'disabled');
@@ -6444,8 +6444,8 @@ var RevisionDialog = function(editorUi, revs, restoreFn)
64446444
{
64456445
spinner.stop();
64466446
pageSelect.style.display = 'none';
6447-
pageSelect.innerHTML = '';
6448-
fileInfo.innerHTML = '';
6447+
pageSelect.innerText = '';
6448+
fileInfo.innerText = '';
64496449
mxUtils.write(fileInfo, mxResources.get('errorLoadingFile'));
64506450
mxUtils.write(errorNode, mxResources.get('errorLoadingFile'));
64516451
});
@@ -6822,7 +6822,7 @@ var DraftDialog = function(editorUi, title, xml, editFn, discardFn, editLabel, d
68226822
parseDiagram(diagrams[currentPage]);
68236823
}
68246824

6825-
pageSelect.innerHTML = '';
6825+
pageSelect.innerText = '';
68266826

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

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

72507250
var resetBtn = mxUtils.button(mxResources.get('reset'), function()
72517251
{
7252-
replAllNotif.innerHTML = '';
7252+
replAllNotif.innerText = '';
72537253
searchInput.value = '';
72547254
searchInput.style.backgroundColor = '';
72557255

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

74457445
var replaceAllBtn = mxUtils.button(mxResources.get('replaceAll'), function()
74467446
{
7447-
replAllNotif.innerHTML = '';
7447+
replAllNotif.innerText = '';
74487448

74497449
if (replaceInput.value)
74507450
{
@@ -7727,7 +7727,7 @@ var FreehandWindow = function(editorUi, x, y, w, h, withBrush)
77277727

77287728
graph.addListener('freehandStateChanged', mxUtils.bind(this, function()
77297729
{
7730-
startBtn.innerHTML = '';
7730+
startBtn.innerText = '';
77317731
mxUtils.write(startBtn, mxResources.get(graph.freehand.isDrawing() ? 'stopDrawing' : 'startDrawing'));
77327732
startBtn.setAttribute('title', mxResources.get(graph.freehand.isDrawing() ? 'stopDrawing' : 'startDrawing'));
77337733
startBtn.className = 'geBtn' + (!graph.freehand.isDrawing() ? ' gePrimaryBtn' : '');
@@ -8072,7 +8072,7 @@ var MoreShapesDialog = function(editorUi, expanded, entries)
80728072
preview.style.textAlign = 'center';
80738073
preview.style.padding = '0px';
80748074
preview.style.color = '';
8075-
preview.innerHTML = '';
8075+
preview.innerText = '';
80768076

80778077
if (entry.desc != null)
80788078
{
@@ -8474,7 +8474,7 @@ var PluginsDialog = function(editorUi, addFn, delFn, closeOnly)
84748474
}
84758475
else
84768476
{
8477-
inner.innerHTML = '';
8477+
inner.innerText = '';
84788478

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

95819581
function updateLabel()
95829582
{
9583-
label.innerHTML = '';
9583+
label.innerText = '';
95849584
label.style.cursor = 'pointer';
95859585
label.style.whiteSpace = 'nowrap';
95869586
label.style.textOverflow = 'ellipsis';
@@ -9636,7 +9636,7 @@ var LibraryDialog = function(editorUi, name, library, initialImages, file, mode)
96369636

96379637
if (entry.title == null || entry.title.length == 0)
96389638
{
9639-
label.innerHTML = '';
9639+
label.innerText = '';
96409640
}
96419641

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

1093510935
if (!internalCall)
1093610936
{
10937-
diagramsTiles.innerHTML = '';
10937+
diagramsTiles.innerText = '';
1093810938
swapActiveItem();
1093910939
curDiagList = diagrams;
1094010940
curSearchImportCats = searchImportCats;
@@ -11651,7 +11651,7 @@ var TemplatesDialog = function(editorUi, callback, cancelCallback,
1165111651
if (recentDocsCallback)
1165211652
{
1165311653
tempDlgContent.scrollTop = 0;
11654-
diagramsTiles.innerHTML = '';
11654+
diagramsTiles.innerText = '';
1165511655
spinner.spin(diagramsTiles);
1165611656
cancelPendingCall = false;
1165711657
callInitiated = true;
@@ -11796,7 +11796,7 @@ var TemplatesDialog = function(editorUi, callback, cancelCallback,
1179611796

1179711797
deselectTempCat();
1179811798
tempDlgContent.scrollTop = 0;
11799-
diagramsTiles.innerHTML = '';
11799+
diagramsTiles.innerText = '';
1180011800
diagramsListTitle.innerHTML = mxUtils.htmlEntities(mxResources.get('searchResults')) +
1180111801
' "' + mxUtils.htmlEntities(searchStr) + '"';
1180211802
delayTimer = null;
@@ -12499,7 +12499,7 @@ AspectDialog.prototype.createPageItem = function(pageId, pageName, pageNode)
1249912499
this.selectedItem = $listItem;
1250012500
this.selectedPage = pageId;
1250112501
$listItem.className += ' geAspectDlgListItemSelected';
12502-
this.layersContainer.innerHTML = '';
12502+
this.layersContainer.innerText = '';
1250312503
this.selectedLayers = {};
1250412504
this.okBtn.setAttribute('disabled', 'disabled');
1250512505

‎src/main/webapp/js/diagramly/Editor.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -5422,7 +5422,7 @@
54225422
picker.appendChild(btn);
54235423
});
54245424

5425-
picker.innerHTML = '';
5425+
picker.innerText = '';
54265426

54275427
for (var i = 0; i < colorsets.length; i++)
54285428
{
@@ -6056,7 +6056,7 @@
60566056

60576057
function refreshTags(tags, selected)
60586058
{
6059-
tagCloud.innerHTML = '';
6059+
tagCloud.innerText = '';
60606060

60616061
if (tags.length > 0)
60626062
{

0 commit comments

Comments
 (0)