Skip to content
Permalink
Browse files

10.5.4 release

  • Loading branch information...
alderg committed Mar 22, 2019
1 parent 49306e1 commit 5182b2c7138673aa06fc37f69ece0a73588a9330
Showing with 278 additions and 125 deletions.
  1. +4 −0 ChangeLog
  2. +1 −1 VERSION
  3. +1 −1 src/main/webapp/cache.manifest
  4. +50 −48 src/main/webapp/js/app.min.js
  5. +33 −13 src/main/webapp/js/diagramly/App.js
  6. +4 −2 src/main/webapp/js/diagramly/DrawioFile.js
  7. +6 −2 src/main/webapp/js/diagramly/DrawioFileSync.js
  8. +27 −21 src/main/webapp/js/diagramly/DriveClient.js
  9. +31 −24 src/main/webapp/js/diagramly/EditorUi.js
  10. +3 −4 src/main/webapp/js/diagramly/Menus.js
  11. +10 −9 src/main/webapp/js/viewer.min.js
  12. +2 −0 src/main/webapp/resources/dia.txt
  13. +2 −0 src/main/webapp/resources/dia_am.txt
  14. +2 −0 src/main/webapp/resources/dia_ar.txt
  15. +2 −0 src/main/webapp/resources/dia_bg.txt
  16. +2 −0 src/main/webapp/resources/dia_bn.txt
  17. +2 −0 src/main/webapp/resources/dia_bs.txt
  18. +2 −0 src/main/webapp/resources/dia_ca.txt
  19. +2 −0 src/main/webapp/resources/dia_cs.txt
  20. +2 −0 src/main/webapp/resources/dia_da.txt
  21. +2 −0 src/main/webapp/resources/dia_de.txt
  22. +2 −0 src/main/webapp/resources/dia_el.txt
  23. +2 −0 src/main/webapp/resources/dia_eo.txt
  24. +2 −0 src/main/webapp/resources/dia_es.txt
  25. +2 −0 src/main/webapp/resources/dia_et.txt
  26. +2 −0 src/main/webapp/resources/dia_fa.txt
  27. +2 −0 src/main/webapp/resources/dia_fi.txt
  28. +2 −0 src/main/webapp/resources/dia_fil.txt
  29. +2 −0 src/main/webapp/resources/dia_fr.txt
  30. +2 −0 src/main/webapp/resources/dia_gu.txt
  31. +2 −0 src/main/webapp/resources/dia_he.txt
  32. +2 −0 src/main/webapp/resources/dia_hi.txt
  33. +2 −0 src/main/webapp/resources/dia_hr.txt
  34. +2 −0 src/main/webapp/resources/dia_hu.txt
  35. +2 −0 src/main/webapp/resources/dia_i18n.txt
  36. +2 −0 src/main/webapp/resources/dia_id.txt
  37. +2 −0 src/main/webapp/resources/dia_it.txt
  38. +2 −0 src/main/webapp/resources/dia_ja.txt
  39. +2 −0 src/main/webapp/resources/dia_kn.txt
  40. +2 −0 src/main/webapp/resources/dia_ko.txt
  41. +2 −0 src/main/webapp/resources/dia_lt.txt
  42. +2 −0 src/main/webapp/resources/dia_lv.txt
  43. +2 −0 src/main/webapp/resources/dia_ml.txt
  44. +2 −0 src/main/webapp/resources/dia_mr.txt
  45. +2 −0 src/main/webapp/resources/dia_ms.txt
  46. +2 −0 src/main/webapp/resources/dia_nl.txt
  47. +2 −0 src/main/webapp/resources/dia_no.txt
  48. +2 −0 src/main/webapp/resources/dia_pl.txt
  49. +2 −0 src/main/webapp/resources/dia_pt-br.txt
  50. +2 −0 src/main/webapp/resources/dia_pt.txt
  51. +2 −0 src/main/webapp/resources/dia_ro.txt
  52. +2 −0 src/main/webapp/resources/dia_ru.txt
  53. +2 −0 src/main/webapp/resources/dia_sk.txt
  54. +2 −0 src/main/webapp/resources/dia_sl.txt
  55. +2 −0 src/main/webapp/resources/dia_sr.txt
  56. +2 −0 src/main/webapp/resources/dia_sv.txt
  57. +2 −0 src/main/webapp/resources/dia_sw.txt
  58. +2 −0 src/main/webapp/resources/dia_ta.txt
  59. +2 −0 src/main/webapp/resources/dia_te.txt
  60. +2 −0 src/main/webapp/resources/dia_th.txt
  61. +2 −0 src/main/webapp/resources/dia_tr.txt
  62. +2 −0 src/main/webapp/resources/dia_uk.txt
  63. +2 −0 src/main/webapp/resources/dia_vi.txt
  64. +2 −0 src/main/webapp/resources/dia_zh-tw.txt
  65. +2 −0 src/main/webapp/resources/dia_zh.txt
@@ -1,3 +1,7 @@
22-MAR-2019: 10.5.4

- Adds custom libraries for Confluence cloud

21-MAR-2019: 10.5.3

- Fixes timing issue in graph viewer
@@ -1 +1 @@
10.5.3
10.5.4
@@ -1,7 +1,7 @@
CACHE MANIFEST

# THIS FILE WAS GENERATED. DO NOT MODIFY!
# 03/21/2019 05:03 PM
# 03/22/2019 05:12 PM

app.html
index.html?offline=1

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -26,11 +26,17 @@ App = function(editor, container, lightbox)
if (file != null && file.constructor == DriveFile && file.isModified() && this.drive != null)
{
EditorUi.logEvent({category: 'DISCARD-SAVE-FILE-' + file.getHash() + '.' +
file.desc.headRevisionId + '.' + file.desc.modifiedDate,
file.desc.headRevisionId + '.' + file.desc.modifiedDate + '-size-' + file.getSize(),
action: 'time-' + new Date().toISOString() + '-saved-' +
((file.lastSaved != null) ? file.lastSaved.toISOString() : 'never'),
((file.lastSaved != null) ? file.lastSaved.toISOString() : 'never') +
((this.editor.autosave) ? '-autosave-on' : '-autosave-off'),
label: (this.drive.user != null) ? this.drive.user.id : 'unknown-user'});
}
else if (file != null && file.isModified())
{
EditorUi.logEvent({category: 'DISCARD-SAVE-FILE-' + file.getHash(), action: 'unload',
label: ((this.editor.autosave) ? 'autosave-on' : 'autosave-off')});
}
});
}

@@ -1769,12 +1775,19 @@ App.prototype.getThumbnail = function(width, success)
{
this.exportToCanvas(mxUtils.bind(this, function(canvas)
{
// Removes temporary graph from DOM
if (graph != this.editor.graph)
try
{
// Removes temporary graph from DOM
if (graph != this.editor.graph && graph.container.parentNode != null)
{
graph.container.parentNode.removeChild(graph.container);
}
}
catch (e)
{
graph.container.parentNode.removeChild(graph.container);
canvas = null;
}

success(canvas);
}), width, this.thumbImageCache, '#ffffff', function()
{
@@ -1854,14 +1867,21 @@ App.prototype.getThumbnail = function(width, success)

asynCanvas.finish(mxUtils.bind(this, function()
{
imgExport.drawState(graph.getView().getState(graph.model.root), htmlCanvas);

// Removes temporary graph from DOM
if (graph != this.editor.graph)
try
{
graph.container.parentNode.removeChild(graph.container);
imgExport.drawState(graph.getView().getState(graph.model.root), htmlCanvas);

// Removes temporary graph from DOM
if (graph != this.editor.graph && graph.container.parentNode != null)
{
graph.container.parentNode.removeChild(graph.container);
}
}

catch (e)
{
canvas = null;
}

success(canvas);
}));

@@ -1872,7 +1892,7 @@ App.prototype.getThumbnail = function(width, success)
{
// ignore and use placeholder
// Removes temporary graph from DOM
if (graph != this.editor.graph)
if (graph != this.editor.graph && graph.container.parentNode != null)
{
graph.container.parentNode.removeChild(graph.container);
}
@@ -1631,13 +1631,15 @@ DrawioFile.prototype.handleFileError = function(err, manual)
{
this.lastWarned = Date.now();
this.ui.hideDialog();
EditorUi.logEvent({category: 'IGNORE-WARN-SAVE-FILE-' + this.getHash(), action: 'ignore'});
EditorUi.logEvent({category: 'IGNORE-WARN-SAVE-FILE-' + this.getHash() +
'-size-' + this.getSize(), action: 'ignore'});
}), null, mxResources.get('save'), mxUtils.bind(this, function()
{
this.lastWarned = Date.now();
this.ui.actions.get((this.ui.mode == null || !this.isEditable()) ?
'saveAs' : 'save').funct();
EditorUi.logEvent({category: 'SAVE-WARN-SAVE-FILE-' + this.getHash(), action: 'save'});
EditorUi.logEvent({category: 'SAVE-WARN-SAVE-FILE-' + this.getHash() +
'-size-' + this.getSize(), action: 'save'});
}), null, null, 360, 120);
}
}
@@ -950,7 +950,9 @@ DrawioFileSync.prototype.merge = function(patches, checksum, desc, success, erro
var uid = (user != null) ? user.id : 'unknown';

EditorUi.logEvent({category: 'PATCH-SYNC-FILE-' + this.file.getHash(),
action: uid, label: this.clientId});
action: uid + '-recvd-' + this.file.stats.bytesReceived + '-msgs-' +
this.file.stats.msgReceived,
label: this.clientId});
}
catch (e)
{
@@ -1122,7 +1124,9 @@ DrawioFileSync.prototype.fileSaved = function(pages, lastDesc, success, error)
var uid = (user != null) ? user.id : 'unknown';

EditorUi.logEvent({category: 'DIFF-SYNC-FILE-' + this.file.getHash(),
action: uid, label: this.clientId});
action: uid + '-diff-' + data.length + '-sent-' +
this.file.stats.bytesSent + '-msgs-' +
this.file.stats.msgSent, label: this.clientId});
}
catch (e)
{
@@ -1070,9 +1070,11 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
}

EditorUi.logEvent({category: 'ERROR-SAVE-FILE-' + file.getHash() + '.' +
file.desc.headRevisionId + '.' + file.desc.modifiedDate,
action: err, label: ((this.user != null) ? this.user.id : 'unknown-user') +
'.' + ((file.sync != null) ? file.sync.clientId : 'nosync')});
file.desc.headRevisionId + '.' + file.desc.modifiedDate + '-size-' + file.getSize(),
action: err, label: ((this.user != null) ? this.user.id : 'unknown-user') + '.' +
((file.sync != null) ? (file.sync.clientId + '-chan-' +
(file.sync.channelId || 'none')) : '-nosync') +
((this.ui.editor.autosave) ? '-autosave-on' : '-autosave-off')});
}
}
catch (ex)
@@ -1294,10 +1296,11 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
{
EditorUi.logEvent({category: 'SUCCESS-SAVE-FILE-' + file.getHash() +
'.' + head0 + '.' + mod0, action: 'saved-' + resp.headRevisionId +
'.' + resp.modifiedDate, label: ((this.user != null) ?
this.user.id : 'unknown-user') + '.' + ((file.sync != null) ?
(file.sync.clientId + '-chan-' + (file.sync.channelId || 'none')) :
'nosync')});
'.' + resp.modifiedDate + '-size-' + file.getSize(),
label: ((this.user != null) ? this.user.id : 'unknown-user') + '.' +
((file.sync != null) ? (file.sync.clientId + '-chan-' +
(file.sync.channelId || 'none')) : '-nosync') +
((this.ui.editor.autosave) ? '-autosave-on' : '-autosave-off')});
}
catch (e)
{
@@ -1487,34 +1490,37 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
(file.desc.mimeType != null && file.desc.mimeType.substring(0, 29) != 'application/vnd.jgraph.mxfile') ||
!this.ui.getThumbnail(this.thumbnailWidth, mxUtils.bind(this, function(canvas)
{
// Callback for getThumbnail
try
{
// Callback for getThumbnail
var thumb = null;
if (canvas != null)

try
{
try
if (canvas != null)
{
// Security errors are possible
thumb = canvas.toDataURL('image/png');
}
catch (e)

// Maximum thumbnail size is 2MB
if (thumb != null)
{
// ignore and continue with placeholder
if (thumb.length > this.maxThumbnailSize)
{
thumb = null;
}
else
{
// Converts base64 data into required format for Drive (base64url with no prefix)
thumb = thumb.substring(thumb.indexOf(',') + 1).replace(/\+/g, '-').replace(/\//g, '_');
}
}
}

// Maximum thumbnail size is 2MB
if (thumb == null || thumb.length > this.maxThumbnailSize)
catch (e)
{
thumb = null;
}
else
{
// Converts base64 data into required format for Drive (base64url with no prefix)
thumb = thumb.substring(thumb.indexOf(',') + 1).replace(/\+/g, '-').replace(/\//g, '_');
}

doSave(thumb, 'image/png');
}
@@ -11822,40 +11822,47 @@
}
catch(e){}


this.remoteInvoke('getCustomLibraries', null, null, function(libsList)
{
libsSection.innerHTML = '';

for (var i = 0; i < libsList.length; i++)
if (libsList.length == 0)
{
var lib = libsList[i];

if (loadedLibs[lib.id])
{
selectedLibs[lib.id] = lib;
}

var libCheck = this.addCheckbox(libsSection, lib.title, loadedLibs[lib.id]);

(function(lib2, check)
libsSection.innerHTML = '<div style="text-align:center;padding-top:20px;color:gray;">' +
mxUtils.htmlEntities(mxResources.get('noLibraries')) + '</div>';
}
else
{
for (var i = 0; i < libsList.length; i++)
{
mxEvent.addListener(check, 'change', function()
var lib = libsList[i];

if (loadedLibs[lib.id])
{
if (this.checked)
{
selectedLibs[lib2.id] = lib2;
}
else
selectedLibs[lib.id] = lib;
}

var libCheck = this.addCheckbox(libsSection, lib.title, loadedLibs[lib.id]);

(function(lib2, check)
{
mxEvent.addListener(check, 'change', function()
{
delete selectedLibs[lib2.id];
}
});
})(lib, libCheck)
if (this.checked)
{
selectedLibs[lib2.id] = lib2;
}
else
{
delete selectedLibs[lib2.id];
}
});
})(lib, libCheck)
}
}
}, function()
{
this.handleError(null, mxResources.get('errorGettingConfLibs', null, 'An error occured while getting Confluence libraries list'));
this.handleError(null, mxResources.get('errorLoadingFile'));
});

div.appendChild(libsSection);
@@ -11907,7 +11914,7 @@
}

if (pendingLibs == 0) this.spinner.stop();
}));
}), null, null, 'https://desk.draw.io/support/solutions/articles/16000092763');
this.showDialog(dlg.container, 340, 375, true, true);
};

@@ -2770,9 +2770,9 @@
{
menu.addSeparator(parent);

menu.addItem(mxResources.get('confCloud', null, 'Confluence Cloud') + '...', null, function()
menu.addItem(mxResources.get('confluenceCloud') + '...', null, function()
{
editorUi.showRemotelyStoredLibrary(mxResources.get('confCloudLibs', null, 'Confluence Cloud Libraries'));
editorUi.showRemotelyStoredLibrary(mxResources.get('libraries'));
}, parent);
}
}));
@@ -2782,8 +2782,7 @@
this.put('edit', new Menu(mxUtils.bind(this, function(menu, parent)
{
this.addMenuItems(menu, ['undo', 'redo', '-', 'cut', 'copy', 'paste', 'delete', '-', 'duplicate', '-',
'find', '-',
'editData', 'editTooltip', '-', 'editStyle', 'editGeometry', '-',
'find', '-', 'editData', 'editTooltip', '-', 'editStyle', 'editGeometry', '-',
'edit', '-', 'editLink', 'openLink', '-',
'selectVertices', 'selectEdges', 'selectAll', 'selectNone', '-', 'lockUnlock']);
})));
Oops, something went wrong.

0 comments on commit 5182b2c

Please sign in to comment.
You can’t perform that action at this time.