10.0.30 release

ChangeLog

@@ -1,3 +1,8 @@
+10-JAN-2019: 10.0.30
+
+- Ignores page width in checksum
+- Uses mxGraph 3.9.13 beta 6
+
 10-JAN-2019: 10.0.29
 
 - Improved error handling for CSV import

VERSION

@@ -1 +1 @@
-10.0.29
+10.0.30

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 01/10/2019 04:12 PM
+# 01/10/2019 08:16 PM
 
 app.html
 index.html?offline=1

src/main/webapp/js/diagramly/DiffSync.js

@@ -589,7 +589,7 @@ EditorUi.prototype.patchCell = function(model, cell, diff, resolve)
  * so that using isEqualNode returns true if the files can be
  * considered equal.
  */
-EditorUi.prototype.getPagesForNode = function(node)
+EditorUi.prototype.getPagesForNode = function(node, nodeName)
 {
 	var tmp = this.editor.extractGraphModel(node, true);
 	
@@ -598,7 +598,7 @@ EditorUi.prototype.getPagesForNode = function(node)
 		node = tmp;
 	}
 
-	var diagrams = node.getElementsByTagName('diagram');
+	var diagrams = node.getElementsByTagName(nodeName || 'diagram');
 	var pages = [];
 	
 	for (var i = 0; i < diagrams.length; i++)

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

@@ -414,6 +414,9 @@ DrawioFile.prototype.checksumError = function(error, patches, details, etag)
 			}
 		}
 		
+		// To avoid async stack
+		var err = new Error();
+		
 		var fn = mxUtils.bind(this, function(file)
 		{
 			var data = this.compressReportData(
@@ -432,7 +435,7 @@ DrawioFile.prototype.checksumError = function(error, patches, details, etag)
 				'\n\nPatches:\n' + json +
 				'\n\nLocal:\n' + data +
 				((remote != null) ? ('\nRemote:\n' + remote) : ''),
-				null, 70000);
+				err, 70000);
 		});
 
 		if (etag == null)

src/main/webapp/js/diagramly/EditorUi.js

@@ -2395,6 +2395,9 @@
 			// ignore in hash and do not diff null names for now
 			diagram.removeAttribute('name');
 			
+			// Rounding errors in pageWidth possible so ignore
+			diagram.removeAttribute('pageWidth');
+			
 			// Model is only a holder for the root
 			model.root = pages[i].root;
 			var xmlNode = codec.encode(model);

src/main/webapp/js/diagramly/Menus.js

@@ -941,16 +941,30 @@
 				
 				editorUi.actions.addAction('testChecksum', mxUtils.bind(this, function()
 				{
-					if (editorUi.pages != null)
-					{
-						mxLog.show();
-						mxLog.debug(editorUi.pages.length + ' page(s) checksum=' +
-							editorUi.getHashValueForPages(editorUi.pages));
-					}
-					else
+			    	var dlg = new TextareaDialog(editorUi, 'Paste Data:', '',
+			    		function(newValue)
 					{
-						editorUi.alert('No pages');
-					}
+						if (newValue.length > 0)
+						{
+							try
+							{
+								var pages = editorUi.getPagesForNode(mxUtils.parseXml(
+									newValue).documentElement, 'mxGraphModel');
+								var checksum = editorUi.getHashValueForPages(pages);
+								console.log('checksum', pages, checksum);
+							}
+							catch (e)
+							{
+								editorUi.handleError(e);
+								console.error(e);
+							}
+						}
+					});
+			    	
+			    	dlg.textarea.style.width = '600px';
+			    	dlg.textarea.style.height = '380px';
+					editorUi.showDialog(dlg.container, 620, 460, true, true);
+					dlg.init();
 				}));
 					
 				this.addMenuItems(menu, ['-', 'testChecksum'], parent);