Skip to content
Permalink
Browse files

10.2.5 release

  • Loading branch information...
alderg committed Feb 20, 2019
1 parent 9177ccf commit 26a6b660b7c74ca3ab2ea8ad17d2cc409a3fee46
Showing with 52,181 additions and 40,914 deletions.
  1. +6 −0 ChangeLog
  2. +1 −1 VERSION
  3. +1 −0 etc/build/build.xml
  4. +1 −1 src/main/webapp/cache.manifest
  5. BIN src/main/webapp/images/google-share.png
  6. +1,854 −1,657 src/main/webapp/js/app.min.js
  7. +0 −7 src/main/webapp/js/diagramly/App.js
  8. +1 −0 src/main/webapp/js/diagramly/Devel.js
  9. +13 −2 src/main/webapp/js/diagramly/Dialogs.js
  10. +73 −6 src/main/webapp/js/diagramly/DriveClient.js
  11. +4 −2 src/main/webapp/js/diagramly/Editor.js
  12. +25 −11 src/main/webapp/js/diagramly/EditorUi.js
  13. +7 −0 src/main/webapp/js/diagramly/Init.js
  14. +0 −6 src/main/webapp/js/diagramly/Trees.js
  15. +22 −22 src/main/webapp/js/diagramly/sidebar/Sidebar-AWS3.js
  16. +31 −76 src/main/webapp/js/diagramly/sidebar/Sidebar-AWS4.js
  17. +1,219 −0 src/main/webapp/js/diagramly/sidebar/Sidebar-AWS4b.js
  18. +12 −3 src/main/webapp/js/diagramly/sidebar/Sidebar.js
  19. +24 −24 src/main/webapp/js/mxgraph/Graph.js
  20. +7 −4 src/main/webapp/js/shapes.min.js
  21. +1 −1 src/main/webapp/js/stencils.min.js
  22. +121 −121 src/main/webapp/js/viewer.min.js
  23. +6 −1 src/main/webapp/resources/dia.txt
  24. +6 −1 src/main/webapp/resources/dia_am.txt
  25. +6 −1 src/main/webapp/resources/dia_ar.txt
  26. +5 −0 src/main/webapp/resources/dia_bg.txt
  27. +6 −1 src/main/webapp/resources/dia_bn.txt
  28. +6 −1 src/main/webapp/resources/dia_bs.txt
  29. +6 −1 src/main/webapp/resources/dia_ca.txt
  30. +6 −1 src/main/webapp/resources/dia_cs.txt
  31. +6 −1 src/main/webapp/resources/dia_da.txt
  32. +6 −1 src/main/webapp/resources/dia_de.txt
  33. +5 −0 src/main/webapp/resources/dia_el.txt
  34. +6 −1 src/main/webapp/resources/dia_eo.txt
  35. +5 −0 src/main/webapp/resources/dia_es.txt
  36. +5 −0 src/main/webapp/resources/dia_et.txt
  37. +5 −0 src/main/webapp/resources/dia_fa.txt
  38. +6 −1 src/main/webapp/resources/dia_fi.txt
  39. +5 −0 src/main/webapp/resources/dia_fil.txt
  40. +6 −1 src/main/webapp/resources/dia_fr.txt
  41. +6 −1 src/main/webapp/resources/dia_gu.txt
  42. +5 −0 src/main/webapp/resources/dia_he.txt
  43. +6 −1 src/main/webapp/resources/dia_hi.txt
  44. +6 −1 src/main/webapp/resources/dia_hr.txt
  45. +6 −1 src/main/webapp/resources/dia_hu.txt
  46. +5 −0 src/main/webapp/resources/dia_i18n.txt
  47. +6 −1 src/main/webapp/resources/dia_id.txt
  48. +5 −0 src/main/webapp/resources/dia_it.txt
  49. +5 −0 src/main/webapp/resources/dia_ja.txt
  50. +6 −1 src/main/webapp/resources/dia_kn.txt
  51. +6 −1 src/main/webapp/resources/dia_ko.txt
  52. +6 −1 src/main/webapp/resources/dia_lt.txt
  53. +6 −1 src/main/webapp/resources/dia_lv.txt
  54. +6 −1 src/main/webapp/resources/dia_ml.txt
  55. +6 −1 src/main/webapp/resources/dia_mr.txt
  56. +6 −1 src/main/webapp/resources/dia_ms.txt
  57. +6 −1 src/main/webapp/resources/dia_nl.txt
  58. +6 −1 src/main/webapp/resources/dia_no.txt
  59. +6 −1 src/main/webapp/resources/dia_pl.txt
  60. +6 −1 src/main/webapp/resources/dia_pt-br.txt
  61. +5 −0 src/main/webapp/resources/dia_pt.txt
  62. +6 −1 src/main/webapp/resources/dia_ro.txt
  63. +6 −1 src/main/webapp/resources/dia_ru.txt
  64. +6 −1 src/main/webapp/resources/dia_sk.txt
  65. +6 −1 src/main/webapp/resources/dia_sl.txt
  66. +6 −1 src/main/webapp/resources/dia_sr.txt
  67. +6 −1 src/main/webapp/resources/dia_sv.txt
  68. +6 −1 src/main/webapp/resources/dia_sw.txt
  69. +6 −1 src/main/webapp/resources/dia_ta.txt
  70. +6 −1 src/main/webapp/resources/dia_te.txt
  71. +5 −0 src/main/webapp/resources/dia_th.txt
  72. +5 −0 src/main/webapp/resources/dia_tr.txt
  73. +6 −1 src/main/webapp/resources/dia_uk.txt
  74. +6 −1 src/main/webapp/resources/dia_vi.txt
  75. +6 −1 src/main/webapp/resources/dia_zh-tw.txt
  76. +6 −1 src/main/webapp/resources/dia_zh.txt
  77. +130 −6 src/main/webapp/shapes/mxAWS4.js
  78. +48,317 −38,923 src/main/webapp/stencils/aws4.xml
@@ -1,3 +1,9 @@
20-FEB-2019: 10.2.5

- Adds fallback for unavailable sharing in Google Drive
- Fixes possible timing issues with open URL parameter
- Fixes link handling in legacy embedded diagrams

18-FEB-2019: 10.2.4

- Adds Microsoft Office add-ins
@@ -1 +1 @@
10.2.4
10.2.5
@@ -112,6 +112,7 @@
<file name="Sidebar-AWS3.js" />
<file name="Sidebar-AWS3D.js" />
<file name="Sidebar-AWS4.js" />
<file name="Sidebar-AWS4b.js" />
<file name="Sidebar-Azure.js" />
<file name="Sidebar-Basic.js" />
<file name="Sidebar-Bootstrap.js" />
@@ -1,7 +1,7 @@
CACHE MANIFEST

# THIS FILE WAS GENERATED. DO NOT MODIFY!
# 02/18/2019 10:33 PM
# 02/20/2019 12:48 PM

app.html
index.html?offline=1
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2054,13 +2054,6 @@ App.prototype.load = function()
}
else
{
// Fallback for cases where the hash property is not available
if ((window.location.hash == null || window.location.hash.length <= 1) &&
urlParams['open'] != null)
{
window.location.hash = urlParams['open'];
}

// Asynchronous or disabled loading of client
if (this.drive == null)
{
@@ -39,6 +39,7 @@ mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-AWS.js');
mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-AWS3.js');
mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-AWS3D.js');
mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-AWS4.js');
mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-AWS4b.js');
mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Azure.js');
mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Basic.js');
mxscript(drawDevUrl + 'js/diagramly/sidebar/Sidebar-Bootstrap.js');
@@ -765,7 +765,7 @@ var SplashDialog = function(editorUi)
/**
*
*/
var ConfirmDialog = function(editorUi, message, okFn, cancelFn, okLabel, cancelLabel, okImg, cancelImg, showRememberOption)
var ConfirmDialog = function(editorUi, message, okFn, cancelFn, okLabel, cancelLabel, okImg, cancelImg, showRememberOption, imgSrc)
{
var div = document.createElement('div');
div.style.textAlign = 'center';
@@ -774,6 +774,7 @@ var ConfirmDialog = function(editorUi, message, okFn, cancelFn, okLabel, cancelL
p2.style.padding = '6px';
p2.style.overflow = 'auto';
p2.style.maxHeight = '44px';
p2.style.lineHeight = '1.2em';

if (mxClient.IS_QUIRKS)
{
@@ -783,6 +784,16 @@ var ConfirmDialog = function(editorUi, message, okFn, cancelFn, okLabel, cancelL
mxUtils.write(p2, message);
div.appendChild(p2);

if (imgSrc != null)
{
var p3 = document.createElement('div');
p3.style.padding = '6px 0 6px 0';
var img = document.createElement('img');
img.setAttribute('src', imgSrc);
p3.appendChild(img);
div.appendChild(p3);
}

var btns = document.createElement('div');
btns.style.textAlign = 'center';
btns.style.whiteSpace = 'nowrap';
@@ -866,7 +877,7 @@ var ConfirmDialog = function(editorUi, message, okFn, cancelFn, okLabel, cancelL
}
else
{
btns.style.marginTop = '16px';
btns.style.marginTop = '12px';
}

this.init = function()
@@ -1723,13 +1723,80 @@ DriveClient.prototype.pickLibrary = function(fn)
*/
DriveClient.prototype.showPermissions = function(id)
{
this.checkToken(mxUtils.bind(this, function()
var fallback = mxUtils.bind(this, function()
{
var shareClient = new gapi.drive.share.ShareClient(this.appId);
shareClient.setOAuthToken(gapi.auth.getToken().access_token);
shareClient.setItemIds([id]);
shareClient.showSettingsDialog();
}));
var dlg = new ConfirmDialog(this.ui, mxResources.get('googleSharingNotAvailable'), mxUtils.bind(this, function()
{
this.ui.editor.graph.openLink('https://drive.google.com/open?id=' + id);
}), null, mxResources.get('open'), null, null, null, null, IMAGE_PATH + '/google-share.png');
this.ui.showDialog(dlg.container, 360, 190, true, true);
dlg.init();
});

if (this.sharingFailed)
{
fallback();
}
else
{
this.checkToken(mxUtils.bind(this, function()
{
var shareClient = new gapi.drive.share.ShareClient(this.appId);
shareClient.setOAuthToken(gapi.auth.getToken().access_token);
shareClient.setItemIds([id]);
shareClient.showSettingsDialog();

// Workaround for https://stackoverflow.com/questions/54753169 is to check
// if "sharing is unavailable" is showing and invoke a fallback dialog
if ('MutationObserver' in window)
{
if (this.sharingObserver != null)
{
this.sharingObserver.disconnect();
this.sharingObserver = null;
}

// Tries again even if observer was still around as the user may have
// closed the dialog while waiting. TODO: Find condition to disconnect
// observer when dialog is closed (use removedNodes?).
this.sharingObserver = new MutationObserver(mxUtils.bind(this, function(mutations)
{
var done = false;

for (var i = 0; i < mutations.length; i++)
{
for (var j = 0; j < mutations[i].addedNodes.length; j++)
{
var child = mutations[i].addedNodes[j];

if (child.nodeName == 'BUTTON' && child.getAttribute('name') == 'ok' &&
child.parentNode != null && child.parentNode.parentNode != null &&
child.parentNode.parentNode.getAttribute('role') == 'dialog')
{
this.sharingFailed = true;
child.click();
fallback();
done = true;
}
else if (child.nodeName == 'DIV' && child.className == 'shr-q-shr-r-shr-xb')
{
done = true;
}
}
}

if (done)
{
this.sharingObserver.disconnect();
this.sharingObserver = null;
}

}));

this.sharingObserver.observe(document, {childList: true, subtree: true});
}
}));
}
};

/**
@@ -4079,6 +4079,7 @@
mxStencilRegistry.libraries['networks'] = [SHAPES_PATH + '/mxNetworks.js', STENCIL_PATH + '/networks.xml'];
mxStencilRegistry.libraries['aws3d'] = [SHAPES_PATH + '/mxAWS3D.js', STENCIL_PATH + '/aws3d.xml'];
mxStencilRegistry.libraries['aws4'] = [SHAPES_PATH + '/mxAWS4.js', STENCIL_PATH + '/aws4.xml'];
mxStencilRegistry.libraries['aws4b'] = [SHAPES_PATH + '/mxAWS4.js', STENCIL_PATH + '/aws4.xml'];
mxStencilRegistry.libraries['veeam'] = [STENCIL_PATH + '/veeam/2d.xml', STENCIL_PATH + '/veeam/3d.xml', STENCIL_PATH + '/veeam/veeam.xml'];
mxStencilRegistry.libraries['pid2inst'] = [SHAPES_PATH + '/pid2/mxPidInstruments.js'];
mxStencilRegistry.libraries['pid2misc'] = [SHAPES_PATH + '/pid2/mxPidMisc.js', STENCIL_PATH + '/pid/misc.xml'];
@@ -4823,7 +4824,7 @@ var ErrorDialog = function(editorUi, title, message, buttonText, fn, retry, butt
hd.style.margin = '0px';
hd.style.fontSize = '18px';
hd.style.paddingBottom = '16px';
hd.style.marginBottom = '16px';
hd.style.marginBottom = '10px';
hd.style.borderBottom = '1px solid #c0c0c0';
hd.style.color = 'gray';
hd.style.whiteSpace = 'nowrap';
@@ -4835,12 +4836,13 @@ var ErrorDialog = function(editorUi, title, message, buttonText, fn, retry, butt
}

var p2 = document.createElement('div');
p2.style.lineHeight = '1.2em';
p2.style.padding = '6px';
p2.innerHTML = message;
div.appendChild(p2);

var btns = document.createElement('div');
btns.style.marginTop = '16px';
btns.style.marginTop = '12px';
btns.style.textAlign = 'center';

if (retry != null)
@@ -142,16 +142,23 @@
*/
EditorUi.debug = function()
{
if (window.console != null && urlParams['test'] == '1')
try
{
var args = [new Date().toISOString()];

for (var i = 0; i < arguments.length; i++)
{
args.push(arguments[i]);
}

console.log.apply(console, args);
if (window.console != null && urlParams['test'] == '1')
{
var args = [new Date().toISOString()];

for (var i = 0; i < arguments.length; i++)
{
args.push(arguments[i]);
}

console.log.apply(console, args);
}
}
catch (e)
{
// ignore
}
};

@@ -3577,8 +3584,15 @@
if (id != null && id.substring(0, 2) == '#G')
{
id = id.substring(2);
msg += '<br><a href="https://drive.google.com/open?id=' + id + '" target="_blank">' +
mxUtils.htmlEntities(mxResources.get('tryOpeningViaThisPage')) + '</a>';

// Special case where the button must have a different label and function
this.showError(title, msg, mxResources.get('cancel'), null, retry,
mxResources.get('tryOpeningViaThisPage'), mxUtils.bind(this, function()
{
this.editor.graph.openLink('https://drive.google.com/open?id=' + id);
}), null, null, 380);

return;
}
}
else if (e.message != null)
@@ -287,3 +287,10 @@ if (urlParams['lightbox'] == '1')
{
urlParams['chrome'] = '0';
}

// Fallback for cases where the hash property is not available
if ((window.location.hash == null || window.location.hash.length <= 1) &&
urlParams['open'] != null)
{
window.location.hash = urlParams['open'];
}
@@ -99,12 +99,6 @@
var spacing = 10;
var level = 40;

// Adds resources for actions
mxResources.parse('selectChildren=Select Children');
mxResources.parse('selectSiblings=Select Siblings');
mxResources.parse('selectDescendants=Select Descendants');
mxResources.parse('selectParent=Select Parent');

function isTreeVertex(cell)
{
return model.isVertex(cell) && hasTreeParent(cell);
Oops, something went wrong.

0 comments on commit 26a6b66

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