12.1.7 release

ChangeLog

@@ -1,3 +1,7 @@
+25-OCT-2019: 12.1.7
+
+- Minor fix for graph viewer
+
 25-OCT-2019: 12.1.6
 
 - Fixes missing center guides for certain cases

VERSION

@@ -1 +1 @@
-12.1.6
+12.1.7

src/main/webapp/cache.manifest

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

src/main/webapp/electron.js

@@ -96,8 +96,8 @@ function createWindow (opt = {})
 
 		if (contents != null)
 		{
-			contents.executeJavaScript('if(typeof global.__emt_isModified === \'function\'){global.__emt_isModified()}', true,
-				isModified =>
+			contents.executeJavaScript('if(typeof global.__emt_isModified === \'function\'){global.__emt_isModified()}', true)
+				.then((isModified) =>
 				{
 					if (__DEV__) 
 					{
@@ -1146,16 +1146,13 @@ function exportDiagram(event, args, directFinalize)
 				}
 				else if (args.format == 'pdf')
 				{
-					contents.printToPDF(pdfOptions, (error, data) => 
+					contents.printToPDF(pdfOptions).then((data) => 
 					{
-						if (error)
-						{
-							event.reply('export-error', error);
-						}
-						else
-						{
-							event.reply('export-success', data);
-						}
+						event.reply('export-success', data);
+					})
+					.catch((error) => 
+					{
+						event.reply('export-error', error);
 					});
 				}
 				else if (args.format == 'svg')

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

@@ -140,9 +140,9 @@ DrawioFileSync = function(file)
 //				{
 //					// Callback adds cancel option
 //				}), e.message);
-				EditorUi.logError('Protocol Error in Client ' + this.clientId,
+				EditorUi.logError('Protocol Error ' + e.message,
 					null, 'protocol_' + DrawioFileSync.PROTOCOL,
-					e.message);
+					'client_' + this.clientId);
 
 				if (window.console != null)
 				{

src/main/webapp/js/diagramly/GraphViewer.js

@@ -751,8 +751,9 @@ GraphViewer.prototype.showLayers = function(graph, sourceGraph)
 	var layers = this.graphConfig.layers;
 	var idx = (layers != null) ? layers.split(' ') : [];
 	var layerIds = this.graphConfig.layerIds;
+	var hasLayerIds = layerIds != null && layerIds.length > 0;
 
-	if (idx.length > 0 || layerIds != null || sourceGraph != null)
+	if (idx.length > 0 || hasLayerIds || sourceGraph != null)
 	{
 		var source = (sourceGraph != null) ? sourceGraph.getModel() : null;
 		var model = graph.getModel();
@@ -772,7 +773,7 @@ GraphViewer.prototype.showLayers = function(graph, sourceGraph)
 			// Shows specified layers (eg. 0 1 3)
 			if (source == null)
 			{
-				if (layerIds != null)
+				if (hasLayerIds)
 				{
 					for (var i = 0; i < layerIds.length; i++)
 					{