12.9.14 release

jgraph · Apr 16, 2020 · b648bc0 · b648bc0
1 parent 247767c
commit b648bc0
Show file tree

Hide file tree

Showing 12 changed files with 199 additions and 158 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+16-APR-2020: 12.9.14
+
+- renamed jscolor to mxJSColor to avoid clash
+
 15-APR-2020: 12.9.13
 
 - Adds file properties dialog

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-12.9.13
+12.9.14
diff --git a/etc/redirect-worker/redirect.js b/etc/redirect-worker/redirect.js
@@ -126,6 +126,7 @@ const redirectMap = new Map([
 		['/features/examples/', 'https://drawio-app.com/'],
 		['/features/training-material/', 'https://drawio-app.com/tutorials/'],
 		['/terms-conditions/', 'https://seibert-media.com/general-terms/'],
+		['/support/', 'https://github.com/jgraph/drawio/wiki/Getting-Support'],
 		['/', 'https://drawio-app.com/']
 	])],
 	['blog.draw.io', new Map([

diff --git a/src/main/webapp/connect/confluence/viewer.js b/src/main/webapp/connect/confluence/viewer.js
@@ -949,6 +949,7 @@
 														{
 															var isPng = fileInfo.mimeType == 'image/png';
 															var timestamp = new Date(fileInfo.modifiedDate).getTime();
+															viewer.updateTitle(fileInfo.title);
 
 															AC.getAttachmentInfo(id, name, function(info)
 															{
@@ -986,6 +987,7 @@
 														{
 															var isPng = fileInfo.file.mimeType == 'image/png';
 															var timestamp = new Date(fileInfo.lastModifiedDateTime).getTime();
+															viewer.updateTitle(fileInfo.name);
 
 															AC.getAttachmentInfo(id, name, function(info)
 															{

diff --git a/src/main/webapp/connect/jira/viewerPanel.js b/src/main/webapp/connect/jira/viewerPanel.js
@@ -336,26 +336,35 @@
 								'width:' + tileWidthCss + ';height:' + tileWidthCss + ';border:1px solid transparent;overflow: hidden;'; 
 							container.className = 'loading';
 
+							//Find displayName
+							value.displayName = value.filename || value.displayName || value.diagramName;
+
 							// Adds filename and ID to side panel
-							var title = document.createElement('div');
+							var title = document.createElement('div'), createDate = null;
 
-							if (value.createDate != null)
-							{
-								var createDate = value.createDate.toLocaleString();
-								mxUtils.write(title, value.filename + ' (' + createDate + ')');
-								var displayName = value.author != null ? value.author.displayName : '';
-								title.setAttribute('title', value.filename + ' (' + createDate + ') - ' + displayName +
-										' [ID: ' + value.id + ']');
-							}
-							else
+							function setTitle()
 							{
-								var t = value.displayName || value.diagramName;
-								mxUtils.write(title, t);
-								var modifiedDate = value.modifiedDate? ' (' + new Date(value.modifiedDate).toLocaleString() + ')' : '';
-								title.setAttribute('title', t + modifiedDate + (value.createdBy? ' - ' + value.createdBy : '') +
-										(value.lastModifiedBy? ' [Last Modified By: ' + value.lastModifiedBy + ']' : ''));
-							}
+								title.innerHTML = '';
+
+								if (value.createDate != null)
+								{
+									createDate = value.createDate.toLocaleString();
+									mxUtils.write(title, value.filename + ' (' + createDate + ')');
+									var displayName = value.author != null ? value.author.displayName : '';
+									title.setAttribute('title', value.filename + ' (' + createDate + ') - ' + displayName +
+											' [ID: ' + value.id + ']');
+								}
+								else
+								{
+									var t = value.displayName || value.diagramName;
+									mxUtils.write(title, t);
+									var modifiedDate = value.modifiedDate? ' (' + new Date(value.modifiedDate).toLocaleString() + ')' : '';
+									title.setAttribute('title', t + modifiedDate + (value.createdBy? ' - ' + value.createdBy : '') +
+											(value.lastModifiedBy? ' [Last Modified By: ' + value.lastModifiedBy + ']' : ''));
+								}
+							};
 
+							setTitle();
 							title.style.cssText = 'position:relative;box-sizing:border-box;width:' + tileWidthCss + ';padding: 6px 0 0 3px;height:' + tbHeight +
 								'px;margin-bottom:-' + tbHeight + 'px;text-align:left;white-space:nowrap;cursor:pointer;overflow:hidden;';
 							tile.appendChild(title);					
@@ -414,7 +423,7 @@
 										}},
 										'remove': {title: mxResources.get('delete'), image: removeImage, handler: function()
 										{
-											if (confirm(mxResources.get('removeIt', [value.filename || value.displayName || value.diagramName]) + '?'))
+											if (confirm(mxResources.get('removeIt', [value.displayName]) + '?'))
 											{
 												if (value.diagramUrl != null || value.service != null)
 												{
@@ -595,7 +604,7 @@
 										'toolbar-position': 'top', toolbar: (value.diagramUrl != null || value.service != null? '' : 'edit ') +
 										'pages layers lightbox remove', border: 8, 'auto-fit': true, resize: false,
 										pageId: pageId, layerIds: layerIds,
-										nav: true, title: value.filename || value.displayName || value.diagramName, 'toolbar-buttons': btnDefs});
+										nav: true, title: value.displayName, 'toolbar-buttons': btnDefs});
 
 									// Handles resize of iframe after zoom
 									var graphDoResizeContainer = viewer.graph.doResizeContainer;
@@ -633,11 +642,11 @@
 
 										AP.dialog.create(
 										{
-						                   header: value.diagramUrl != null || value.service != null? (value.displayName || value.diagramName) : value.filename + ' (' + createDate + ')',
+						                   header: value.displayName + (createDate? ' (' + createDate + ')' : ''),
 										   key: 'drawioFullScreenViewer',
 						                   size: 'fullscreen',
 										   chrome: true,
-										   customData: {diagramUrl: value.diagramUrl, diagramName: value.filename || value.displayName || value.diagramName, 
+										   customData: {diagramUrl: value.diagramUrl, diagramName: value.displayName, 
 											   diagramId: value.id || attId, pageId: pageId, layerIds: layerIds, diagInfo: value}
 										});					
 									};
@@ -759,6 +768,8 @@
 									{
 										var prefix = new Date(fileInfo.modifiedDate).getTime() + '_';
 										var postfix = 'G' + fileInfo.id;
+										value.displayName = fileInfo.title;
+										setTitle();
 
 										tryCachedFile(prefix, postfix, value.nameDiff, function()
 										{
@@ -802,6 +813,8 @@
 									{
 										var prefix = new Date(fileInfo.lastModifiedDateTime).getTime() + '_';
 										var postfix = 'W' + fileInfo.id;
+										value.displayName = fileInfo.name;
+										setTitle();
 
 										tryCachedFile(prefix, postfix, value.nameDiff, function()
 										{

diff --git a/src/main/webapp/connect/jira/viewerPanel2.html b/src/main/webapp/connect/jira/viewerPanel2.html
@@ -285,7 +285,7 @@
 										};
 
 										var viewer = new GraphViewer(container, doc.documentElement, {highlight: '#3572b0',
-											'toolbar-position': 'top', toolbar: 'edit pages layers lightbox remove', 'max-height':
+											'toolbar-position': 'top', toolbar: 'pages layers lightbox remove', 'max-height':
 											Math.max(280, document.documentElement.offsetWidth / 1.5), border: 8,
 											/* disables automatic zoom with no buttons */'auto-fit': false,
 											nav: true, title: value.filename + ' [' + value.id + ']', 'toolbar-buttons': btnDefs});