10.2.8 release

ChangeLog

@@ -1,3 +1,8 @@
+25-FEB-2019: 10.2.8
+
+- Fixes import of multiple pages into empty file
+- Fixes macro shortcut handling in Confluence cloud
+
 25-FEB-2019: 10.2.7
 
 - Adds orthogonal loop, no jump property for edges

VERSION

@@ -1 +1 @@
-10.2.7
+10.2.8

src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 02/25/2019 01:29 PM
+# 02/25/2019 07:32 PM
 
 app.html
 index.html?offline=1

src/main/webapp/electron.js

@@ -46,7 +46,6 @@ function createWindow (opt = {})
 			'od': 0,
 			'gh': 0,
 			'tr': 0,
-			'analytics': 0,
 			'picker': 0,
 			'mode': 'device',
 			'browser': 0,

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

@@ -6473,26 +6473,36 @@
 	
 			if (xml != null && xml.length > 0)
 			{
-				var doc = mxUtils.parseXml(xml);
-				
-				// Checks for mxfile with multiple pages
-				var node = this.editor.extractGraphModel(doc.documentElement, this.pages != null);
-				
-				if (node != null && node.nodeName == 'mxfile' && this.pages != null)
+				// Adds pages
+				graph.model.beginUpdate();
+				try
 				{
-					var diagrams = node.getElementsByTagName('diagram');
-
-					if (diagrams.length == 1)
-					{
-						node = mxUtils.parseXml(graph.decompress(mxUtils.getTextContent(diagrams[0]))).documentElement;
-					}
-					else if (diagrams.length > 1)
+					var doc = mxUtils.parseXml(xml);
+					
+					// Checks for mxfile with multiple pages
+					var node = this.editor.extractGraphModel(doc.documentElement, this.pages != null);
+					
+					if (node != null && node.nodeName == 'mxfile' && this.pages != null)
 					{
-						// Adds pages
-						graph.model.beginUpdate();
-						try
+						var diagrams = node.getElementsByTagName('diagram');
+	
+						if (diagrams.length == 1)
+						{
+							node = mxUtils.parseXml(graph.decompress(mxUtils.getTextContent(diagrams[0]))).documentElement;
+						}
+						else if (diagrams.length > 1)
 						{
-							for (var i = 0; i < diagrams.length; i++)
+							var i0 = 0;
+							
+							// Adds first page to current page if current page is only page and empty
+							if (this.pages != null && this.pages.length == 1 && this.isDiagramEmpty())
+							{
+								node = mxUtils.parseXml(graph.decompress(mxUtils.getTextContent(diagrams[0]))).documentElement;
+								crop = false;
+								i0 = 1;
+							}
+
+							for (var i = i0; i < diagrams.length; i++)
 							{
 								// Imported pages must obtain a new ID
 								diagrams[i].removeAttribute('id');
@@ -6506,19 +6516,19 @@
 									page.setName(mxResources.get('pageWithNumber', [index + 1]));
 								}
 								
-								graph.model.execute(new ChangePage(this, page, page, index));
+								graph.model.execute(new ChangePage(this, page, page, index, true));
 							}
 						}
-						finally
-						{
-							graph.model.endUpdate();
-						}
+					}
+					
+					if (node != null && node.nodeName === 'mxGraphModel')
+					{
+						cells = graph.importGraphModel(node, dx, dy, crop);
 					}
 				}
-				
-				if (node != null && node.nodeName === 'mxGraphModel')
+				finally
 				{
-					cells = graph.importGraphModel(node, dx, dy, crop);
+					graph.model.endUpdate();
 				}
 			}
 		}

src/main/webapp/js/diagramly/Pages.js

@@ -221,12 +221,13 @@ SelectPage.prototype.execute = function()
 /**
  * 
  */
-function ChangePage(ui, page, select, index)
+function ChangePage(ui, page, select, index, noSelect)
 {
 	SelectPage.call(this, ui, select);
 	this.relatedPage = page;
 	this.index = index;
 	this.previousIndex = null;
+	this.noSelect = noSelect;
 };
 
 mxUtils.extend(ChangePage, SelectPage);
@@ -253,8 +254,11 @@ ChangePage.prototype.execute = function()
 		this.ui.pages.splice(this.index, 0, this.relatedPage);
 		this.index = null;
 	}
-
-	SelectPage.prototype.execute.apply(this, arguments);
+	
+	if (!this.noSelect)
+	{
+		SelectPage.prototype.execute.apply(this, arguments);
+	}
 };
 
 /**