10.4.8 release

ChangeLog

@@ -1,3 +1,7 @@
+15-MAR-2019: 10.4.8
+
+- Adds autosaveDelay and defaultEdgeLength to drawio-config
+
 15-MAR-2019: 10.4.7
 
 - Realtime warning can be permanently closed

VERSION

@@ -1 +1 @@
-10.4.7
+10.4.8

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 03/15/2019 10:51 AM
+# 03/15/2019 07:50 PM
 
 app.html
 index.html?offline=1

src/main/webapp/export3.html

@@ -123,6 +123,7 @@
 			var preview = null;
 			var waitCounter = 1;
 			var bounds;
+			var pageId;
 			// Waits for all images to finish loading
 			var cache = new Object();
 			var math = false;
@@ -136,6 +137,7 @@
 					doneDiv.id = 'LoadingComplete';
 					doneDiv.style.display = 'none';
 					doneDiv.setAttribute('bounds', JSON.stringify(bounds));
+					doneDiv.setAttribute('page-id', pageId);
 					document.body.appendChild(doneDiv);
 				}
 			};
@@ -347,15 +349,17 @@
 						
 						if (autoScale)
 						{
-							if (b.width < 800 & b.height < 1200)
+							var pageWidth = (extras != null && extras.pageWidth != null) ? extras.pageWidth : 800;
+							
+							if (b.width < pageWidth & b.height < 1.5 * pageWidth)
 							{
 								s = 4;
 							}
-							else if (b.width < 1600 & b.height < 2400)
+							else if (b.width < 2 * pageWidth & b.height < 3 * pageWidth)
 							{
 								s = 3;
 							}
-							else if (b.width < 3200 && b.height < 4800)
+							else if (b.width < 4 * pageWidth && b.height < 6 * pageWidth)
 							{
 								s = 2;
 							}
@@ -497,6 +501,11 @@
 				{
 					if (diagrams[i] != null)
 					{
+						if (pageId == null)
+						{
+							pageId = diagrams[i].getAttribute('id')
+						}
+						
 						xmlDoc = mxUtils.parseXml(Graph.decompress(mxUtils.getTextContent(diagrams[i])));
 						graph.getModel().clear();
 						from = i;

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

@@ -713,6 +713,64 @@ App.main = function(callback, createUi)
 		doLoad(mxResources.getDefaultBundle(RESOURCE_BASE, mxLanguage) ||
 			mxResources.getSpecialBundle(RESOURCE_BASE, mxLanguage));
 	};
+	
+	// Optional override for autosaveDelay and defaultEdgeLength
+	try
+	{
+		if (mxSettings.settings != null)
+		{
+			if (mxSettings.settings.autosaveDelay != null)
+			{
+				var val = parseInt(mxSettings.settings.autosaveDelay);
+				
+				if (!isNaN(val) && val > 0)
+				{
+					DrawioFile.prototype.autosaveDelay = val;
+
+					if (window.console != null)
+					{
+						console.log('Setting autosaveDelay to ' + DrawioFile.prototype.autosaveDelay);
+					}
+				}
+				else
+				{
+					if (window.console != null)
+					{
+						console.log('Invalid value for autosaveDelay');
+					}
+				}
+			}
+			
+			if (mxSettings.settings.defaultEdgeLength != null)
+			{
+				var val = parseInt(mxSettings.settings.defaultEdgeLength);
+				
+				if (!isNaN(val) && val > 0)
+				{
+					Graph.prototype.defaultEdgeLength = val;
+		
+					if (window.console != null)
+					{
+						console.log('Setting defaultEdgeLength to ' + Graph.prototype.defaultEdgeLength);
+					}
+				}
+				else
+				{
+					if (window.console != null)
+					{
+						console.log('Invalid value for defaultEdgeLength');
+					}
+				}
+			}
+		}
+	}
+	catch (e)
+	{
+		if (window.console != null)
+		{
+			console.error(e);
+		}
+	}
 
 	// Sends load event if configuration is requested and waits for configure action
 	if (urlParams['configure'] == '1')

src/main/webapp/js/diagramly/DrawioFile.js

@@ -477,7 +477,7 @@ DrawioFile.prototype.checksumError = function(error, patches, details, etag, fun
 					this.ui.getPagesForNode(
 					mxUtils.parseXml(file.data).documentElement)), 25000) : 'n/a';
 				
-				this.sendErrorReport('Checksum Error in ' + functionName + ' ' + this.getId(),
+				this.sendErrorReport('Checksum Error in ' + functionName + ' ' + this.getHash(),
 					((details != null) ? (details) : '') +  '\n\nPatches:\n' + json +
 					((remote != null) ? ('\n\nRemote:\n' + remote) : ''), null, 70000);
 			});
@@ -507,13 +507,15 @@ DrawioFile.prototype.checksumError = function(error, patches, details, etag, fun
 			var uid = (user != null) ? user.id : 'unknown';
 			
 			EditorUi.logError('Checksum Error in ' + functionName + ' ' + this.getId(),
-				null, this.getMode() + '.' + this.getId(), uid);
+				null, this.getMode() + '.' + this.getId(), uid + '.' +
+				((this.sync != null) ? this.sync.clientId : 'nosync'));
 			
 			// Logs checksum error for file
 			try
 			{
 				EditorUi.logEvent({category: 'CHECKSUM-ERROR-SYNC-FILE-' + this.getHash(),
-					action: functionName, label: uid});
+					action: functionName, label:  uid + '.' +
+					((this.sync != null) ? this.sync.clientId : 'nosync')});
 			}
 			catch (e)
 			{

src/main/webapp/js/diagramly/DrawioFileSync.js

@@ -946,8 +946,11 @@ DrawioFileSync.prototype.merge = function(patches, checksum, desc, success, erro
 				// Logs successull patch
 				try
 				{
+					var user = this.file.getCurrentUser();
+					var uid = (user != null) ? user.id : 'unknown';
+
 					EditorUi.logEvent({category: 'PATCH-SYNC-FILE-' + this.file.getHash(),
-						action: 'DrawioFileSync.merge', label: this.clientId});
+						action: uid, label: this.clientId});
 				}
 				catch (e)
 				{
@@ -1115,8 +1118,11 @@ DrawioFileSync.prototype.fileSaved = function(pages, lastDesc, success, error)
 			// Logs successull diff
 			try
 			{
+				var user = this.file.getCurrentUser();
+				var uid = (user != null) ? user.id : 'unknown';
+				
 				EditorUi.logEvent({category: 'DIFF-SYNC-FILE-' + this.file.getHash(),
-					action: 'DrawioFileSync.fileSaved', label: this.clientId});
+					action: uid, label: this.clientId});
 			}
 			catch (e)
 			{

src/main/webapp/js/diagramly/DriveClient.js

@@ -1065,7 +1065,8 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
 				EditorUi.logEvent({category: 'ERROR-SAVE-FILE-' + file.getHash()  + '.' +
 					file.desc.headRevisionId + '.' + file.desc.modifiedDate,
 					action: 'error-' + file.getErrorMessage(e),
-					label: (this.user != null) ? this.user.id : 'unknown-user'});
+					label: (this.user != null) ? this.user.id : 'unknown-user'} +
+					'.' + ((file.sync != null) ? file.sync.clientId : 'nosync'));
 			}
 		}
 		catch (e)
@@ -1087,6 +1088,7 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
 				'\n\nBrowser=' + navigator.userAgent +
 				'\nFile=' + file.desc.id + '.' + file.desc.headRevisionId +
 				'\nUser=' + ((this.user != null) ? this.user.id : 'unknown') +
+				 	'.' + ((file.sync != null) ? file.sync.clientId : 'nosync') +
 				'\nMessage=' + e.message +
 				'\n\nStack:\n' + e.stack);
 		}
@@ -1210,6 +1212,7 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
 										'\n\nBrowser=' + navigator.userAgent +
 										'\nFile=' + file.desc.id + ' ' + file.desc.mimeType +
 										'\nUser=' + ((this.user != null) ? this.user.id : 'unknown') +
+										 	'.' + ((file.sync != null) ? file.sync.clientId : 'nosync') +
 										'\nOld=' + head0 + ' ' + mod0 + ' etag-hash=' + this.ui.hashValue(etag0) +
 										'\nNew=' + resp.headRevisionId + ' ' + resp.modifiedDate + '  etag-hash=' + this.ui.hashValue(resp.etag))
 									EditorUi.logError('Critical: Error saving to Google Drive ' + file.desc.id,
@@ -1252,7 +1255,8 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
 										EditorUi.logEvent({category: file.convertedFrom + '-CONVERT-FILE-' + file.getHash(),
 											action: 'from-' + prevDesc.id + '.' + prevDesc.headRevisionId +
 											'-to-' + file.desc.id + '.' + file.desc.headRevisionId,
-											label: (this.user != null) ? this.user.id : 'unknown-user'});
+											label: (this.user != null) ? this.user.id : 'unknown-user' +
+												'.' + ((file.sync != null) ? file.sync.clientId : 'nosync')});
 									}
 									catch (e)
 									{
@@ -1265,8 +1269,9 @@ 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'});
+										'.' + resp.modifiedDate, label: ((this.user != null) ?
+										this.user.id : 'unknown-user') + '.' + ((file.sync != null) ?
+										file.sync.clientId : 'nosync')});
 								}
 								catch (e)
 								{
@@ -1340,9 +1345,10 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
 																// Logs overwrite
 																try
 																{
-																	EditorUi.logError('Warning: Stale Etag Overwrite ' + file.desc.id,
+																	EditorUi.logError('Warning: Stale Etag Overwrite ' + file.getHash(),
 																		null, file.desc.id + '.' + file.desc.headRevisionId,
-																		(this.user != null) ? this.user.id : 'unknown');
+																		(this.user != null) ? this.user.id : 'unknown' +
+																		'.' + ((file.sync != null) ? file.sync.clientId : 'nosync'));
 																}
 																catch (e)
 																{

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

@@ -338,6 +338,7 @@
 			ColorDialog.prototype.defaultColors = config.defaultColors || ColorDialog.prototype.defaultColors;
 			StyleFormatPanel.prototype.defaultColorSchemes = config.defaultColorSchemes || StyleFormatPanel.prototype.defaultColorSchemes;
 			Graph.prototype.defaultEdgeLength = config.defaultEdgeLength || Graph.prototype.defaultEdgeLength;
+			DrawioFile.prototype.autosaveDelay = config.autosaveDelay || DrawioFile.prototype.autosaveDelay;
 			
 			if (config.templateFile != null)
 			{