Skip to content
Permalink
Browse files

10.2.1 release

  • Loading branch information...
alderg committed Feb 9, 2019
1 parent 418435d commit 886a0e8fbb8fa15b459554abdd2a0ecf929ab24e
Showing with 826 additions and 748 deletions.
  1. +6 −0 ChangeLog
  2. +1 −1 VERSION
  3. +1 −1 src/main/webapp/cache.manifest
  4. +703 −702 src/main/webapp/js/app.min.js
  5. +109 −38 src/main/webapp/js/diagramly/App.js
  6. +6 −6 src/main/webapp/js/mxgraph/Sidebar.js
@@ -1,3 +1,9 @@
09-FEB-2019: 10.2.1

- Fixes loading of configuration for confluence cloud
- Adds template-filename URL parameter for binary templates
- Fixes browser refresh for converted lightbox files

08-FEB-2019: 10.2.0

- Adds vsd(x) and gliffy support in GDrive Connector
@@ -1 +1 @@
10.2.0
10.2.1
@@ -1,7 +1,7 @@
CACHE MANIFEST

# THIS FILE WAS GENERATED. DO NOT MODIFY!
# 02/08/2019 05:51 PM
# 02/09/2019 04:19 PM

app.html
index.html?offline=1

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -487,25 +487,42 @@ App.main = function(callback, createUi)

for (var i = 0; i < t.length; i++)
{
var url = App.pluginRegistry[t[i]];

if (url != null && pluginsLoaded[url] == null)
if (t[i] != null && t[i].length > 0)
{
pluginsLoaded[url] = true;

if (typeof window.drawDevUrl === 'undefined')
try
{
mxscript(url);
var url = App.pluginRegistry[t[i]];

if (url != null)
{
if (pluginsLoaded[url] == null)
{
pluginsLoaded[url] = true;

if (typeof window.drawDevUrl === 'undefined')
{
mxscript(url);
}
else
{
mxscript(drawDevUrl + url);
}
}
}
else if (window.console != null)
{
console.log('Unknown plugin:', t[i]);
}
}
else
catch (e)
{
mxscript(drawDevUrl + url);
if (window.console != null)
{
console.log('Error loading plugin:', t[i], e);
}
}
}
else if (window.console != null)
{
console.log('Unknown plugin:', t[i]);
}

}
}
else if (urlParams['chrome'] != '0' && !EditorUi.isElectronApp)
@@ -3105,7 +3122,7 @@ App.prototype.saveFile = function(forceDialog, success)
* @param {number} dx X-coordinate of the translation.
* @param {number} dy Y-coordinate of the translation.
*/
App.prototype.loadTemplate = function(url, onload, onerror)
App.prototype.loadTemplate = function(url, onload, onerror, templateFilename)
{
var realUrl = url;

@@ -3114,17 +3131,19 @@ App.prototype.loadTemplate = function(url, onload, onerror)
var nocache = 't=' + new Date().getTime();
realUrl = PROXY_URL + '?url=' + encodeURIComponent(url) + '&' + nocache;
}

var filterFn = (templateFilename != null) ? templateFilename : url;

this.loadUrl(realUrl, mxUtils.bind(this, function(data)
{
if (/(\.vsdx)($|\?)/i.test(url))
if (/(\.v(dx|sdx?))($|\?)/i.test(filterFn))
{
this.importVisio(this.base64ToBlob(data.substring(data.indexOf(',') + 1)), function(xml)
{
onload(xml);
}, onerror, url);
}, onerror, filterFn);
}
else if (!this.isOffline() && new XMLHttpRequest().upload && this.isRemoteFileFormat(data, url))
else if (!this.isOffline() && new XMLHttpRequest().upload && this.isRemoteFileFormat(data, filterFn))
{
// Asynchronous parsing via server
this.parseFile(new Blob([data], {type: 'application/octet-stream'}), mxUtils.bind(this, function(xhr)
@@ -3155,7 +3174,7 @@ App.prototype.loadTemplate = function(url, onload, onerror)

onload(data);
}
}), onerror, /(\.png)($|\?)/i.test(url) || /(\.vsdx)($|\?)/i.test(url));
}), onerror, /(\.png)($|\?)/i.test(filterFn) || /(\.v(dx|sdx?))($|\?)/i.test(filterFn));
};

/**
@@ -3583,7 +3602,7 @@ App.prototype.loadFile = function(id, sameWindow, file, success, force)

var doFallback = mxUtils.bind(this, function()
{
// Fallback for non-public Google Drive diagrams
// Fallback for non-public Google Drive files
if (url.substring(0, 31) == 'https://drive.google.com/uc?id=' &&
(this.drive != null || typeof window.DriveClient === 'function'))
{
@@ -3595,7 +3614,27 @@ App.prototype.loadFile = function(id, sameWindow, file, success, force)

if (this.drive != null)
{
this.loadFile('G' + url.substring(31, url.lastIndexOf('&ex')), sameWindow, success);
var tempId = url.substring(31, url.lastIndexOf('&ex'));

this.loadFile('G' + tempId, sameWindow, null, mxUtils.bind(this, function()
{
var currentFile = this.getCurrentFile();

if (currentFile != null && this.editor.chromeless && !this.editor.editable)
{
currentFile.getHash = function()
{
return 'G' + tempId;
};

window.location.hash = '#' + currentFile.getHash();
}

if (success != null)
{
success();
}
}));

return true;
}
@@ -3672,7 +3711,8 @@ App.prototype.loadFile = function(id, sameWindow, file, success, force)
this.handleError({message: mxResources.get('fileNotFound')},
mxResources.get('errorLoadingFile'));
}
}));
}), (urlParams['template-filename'] != null) ?
decodeURIComponent(urlParams['template-filename']) : null);
}
else
{
@@ -3704,18 +3744,40 @@ App.prototype.loadFile = function(id, sameWindow, file, success, force)
{
this.handleError({message: mxResources.get('serviceUnavailableOrBlocked')}, mxResources.get('errorLoadingFile'), mxUtils.bind(this, function()
{
var file = this.getCurrentFile();
window.location.hash = (file != null) ? file.getHash() : '';
var currentFile = this.getCurrentFile();
window.location.hash = (currentFile != null) ? currentFile.getHash() : '';
}));
}
else
{
var peerChar = id.charAt(0);
id = decodeURIComponent(id.substring(1));

peer.getFile(id, mxUtils.bind(this, function(file)
{
this.spinner.stop();
this.fileLoaded(file);
var currentFile = this.getCurrentFile();

// Keeps ID event for converted files in chromeless mode for refresh to work
if (currentFile == null)
{
window.location.hash = '';
this.showSplash();
}
else if (this.editor.chromeless && !this.editor.editable)
{
currentFile.getHash = function()
{
return peerChar + id;
};

window.location.hash = '#' + currentFile.getHash();
}
else
{
window.location.hash = currentFile.getHash();
}

if (success != null)
{
@@ -3731,16 +3793,16 @@ App.prototype.loadFile = function(id, sameWindow, file, success, force)

this.handleError(resp, (resp != null) ? mxResources.get('errorLoadingFile') : null, mxUtils.bind(this, function()
{
var file = this.getCurrentFile();
var currentFile = this.getCurrentFile();

if (file == null)
if (currentFile == null)
{
window.location.hash = '';
this.showSplash();
}
else
{
window.location.hash = file.getHash();
window.location.hash = '#' + currentFile.getHash();
}
}));
}));
@@ -4502,24 +4564,33 @@ App.prototype.convertFile = function(url, filename, mimeType, extension, success

req.onload = mxUtils.bind(this, function()
{
var blob = null;

if (gitHubUrl)
if (req.status >= 200 && req.status <= 299)
{
var file = JSON.parse(req.responseText);
blob = this.base64ToBlob(file.content, 'application/octet-stream');
var blob = null;

if (gitHubUrl)
{
var file = JSON.parse(req.responseText);
blob = this.base64ToBlob(file.content, 'application/octet-stream');
}
else
{
blob = new Blob([req.response], {type: 'application/octet-stream'});
}

this.importVisio(blob, mxUtils.bind(this, function(xml)
{
success(new LocalFile(this, xml, name, true));
}), error, filename)
}
else
else if (error != null)
{
blob = new Blob([req.response], {type: 'application/octet-stream'});
error({message: mxResources.get('errorLoadingFile')});
}

this.importVisio(blob, mxUtils.bind(this, function(xml)
{
success(new LocalFile(this, xml, name, true));
}), error, filename)
});

req.onerror = error;

req.send();
}
else
@@ -1585,12 +1585,12 @@ Sidebar.prototype.addUmlPalette = function(expand)
this.createEdgeTemplateEntry('endArrow=open;endSize=12;dashed=1;html=1;', 160, 0, 'Use', 'Dependency', null, 'uml dependency use'),
this.createEdgeTemplateEntry('endArrow=block;endSize=16;endFill=0;html=1;', 160, 0, 'Extends', 'Generalization', null, 'uml generalization extend'),
this.createEdgeTemplateEntry('endArrow=block;startArrow=block;endFill=1;startFill=1;html=1;', 160, 0, '', 'Association 2', null, 'uml association'),
this.createEdgeTemplateEntry('endArrow=open;startArrow=circlePlus;endFill=0;startFill=0;endSize=8;html=1;', 160, 0, '', 'Inner Class', null, 'inner class'),
this.createEdgeTemplateEntry('endArrow=open;startArrow=cross;endFill=0;startFill=0;endSize=8;startSize=10;html=1;', 160, 0, '', 'Terminate', null, 'terminate'),
this.createEdgeTemplateEntry('endArrow=block;dashed=1;endFill=0;endSize=12;html=1;', 160, 0, '', 'Implementation', null, 'realization implementation'),
this.createEdgeTemplateEntry('endArrow=diamondThin;endFill=0;endSize=24;html=1;', 160, 0, '', 'Aggregation 2', null, 'aggregation'),
this.createEdgeTemplateEntry('endArrow=diamondThin;endFill=1;endSize=24;html=1;', 160, 0, '', 'Composition 2', null, 'composition'),
this.createEdgeTemplateEntry('endArrow=open;endFill=1;endSize=12;html=1;', 160, 0, '', 'Association 3', null, 'association')
this.createEdgeTemplateEntry('endArrow=open;startArrow=circlePlus;endFill=0;startFill=0;endSize=8;html=1;', 160, 0, '', 'Inner Class', null, 'uml inner class'),
this.createEdgeTemplateEntry('endArrow=open;startArrow=cross;endFill=0;startFill=0;endSize=8;startSize=10;html=1;', 160, 0, '', 'Terminate', null, 'uml terminate'),
this.createEdgeTemplateEntry('endArrow=block;dashed=1;endFill=0;endSize=12;html=1;', 160, 0, '', 'Implementation', null, 'uml realization implementation'),
this.createEdgeTemplateEntry('endArrow=diamondThin;endFill=0;endSize=24;html=1;', 160, 0, '', 'Aggregation 2', null, 'uml aggregation'),
this.createEdgeTemplateEntry('endArrow=diamondThin;endFill=1;endSize=24;html=1;', 160, 0, '', 'Composition 2', null, 'uml composition'),
this.createEdgeTemplateEntry('endArrow=open;endFill=1;endSize=12;html=1;', 160, 0, '', 'Association 3', null, 'uml association')
];

this.addPaletteFunctions('uml', mxResources.get('uml'), expand || false, fns);

0 comments on commit 886a0e8

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