6.7.6 release

Former-commit-id: 89c43b4

ChangeLog

@@ -1,3 +1,7 @@
+06-JUN-2017: 6.7.6
+
+- Adds VSDX export in online webapp
+
 06-JUN-2017: 6.7.5
 
 - Fixes links in labels for lightbox on touch devices

VERSION

@@ -1 +1 @@
-6.7.5
+6.7.6

etc/build/build.xml

@@ -280,6 +280,16 @@
 			</sources>
 		</jscomp>
 
+		<jscomp compilationLevel="simple" debug="false" forceRecompile="true" output="${war.dir}/js/vsdx.min.js">
+			<sources dir="${war.dir}/js/jszip">
+				<file name="jszip.min.js" />
+			</sources>
+			<sources dir="${war.dir}/js/diagramly/vsdx">
+				<file name="VsdxExport.js" />
+				<file name="mxVsdxCanvas2D.js" />
+			</sources>
+		</jscomp>
+
 		<jscomp compilationLevel="simple" debug="false" forceRecompile="true" output="${war.dir}/js/app.min.js">
 			<sources dir="${war.dir}/js/spin">
 				<file name="spin.min.js" />

war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 06/06/2017 01:24 PM
+# 06/06/2017 05:29 PM
 
 app.html
 index.html?offline=1

war/js/diagramly/Menus.js

@@ -731,16 +731,6 @@
 
 				this.addMenuItems(menu, ['testXmlImageExport'], parent);
 
-				// For testing local Vsdx export
-				mxResources.parse('testVsdxExport=Vsdx Export');
-
-				this.editorUi.actions.addAction('testVsdxExport', mxUtils.bind(this, function()
-				{
-					new VsdxExport(this.editorUi).exportCurrentDiagrams();
-				}));
-
-				this.addMenuItems(menu, ['testVsdxExport'], parent);
-
 				mxResources.parse('testShowRtModel=Show RT model');
 				mxResources.parse('testDebugRtModel=Debug RT model');
 				mxResources.parse('testDownloadRtModel=Download RT model');
@@ -1299,6 +1289,40 @@
 				//this.editorUi.downloadFile('html');
 			}), parent);
 
+			if (!editorUi.isOfflineApp() && (typeof(VsdxExport) !== 'undefined' || !editorUi.isOffline()))
+			{
+				menu.addItem(mxResources.get('formatVsdx') + '...', null, mxUtils.bind(this, function()
+				{
+					var delayed = mxUtils.bind(this, function()
+					{
+						// Checks for signature method
+						if (typeof(VsdxExport) !== 'undefined')
+						{
+							try
+							{
+								new VsdxExport(editorUi).exportCurrentDiagrams();
+							}
+							catch (e)
+							{
+								// ignore
+							}
+						}
+					});
+
+					if (typeof(VsdxExport) === 'undefined' && !this.loadingVsdx && !editorUi.isOffline())
+					{
+						this.loadingVsdx = true;
+						// Dependencies included in Devel.js
+						mxscript('/js/vsdx.min.js', delayed);
+					}
+					else
+					{
+						// Must be async for cell selection
+						window.setTimeout(delayed, 0);
+					}
+				}), parent);
+			}
+
 			menu.addSeparator(parent);
 
 			menu.addItem(mxResources.get('formatXml') + '...', null, mxUtils.bind(this, function()

war/js/diagramly/vsdx/VsdxExport.js

@@ -832,8 +832,8 @@ VsdxExport.prototype.PART_NAME = "PartName";
 VsdxExport.prototype.CONTENT_TYPES_XML = "[Content_Types].xml";
 VsdxExport.prototype.VISIO_PAGES_RELS = "visio/pages/_rels/";
 VsdxExport.prototype.ARROWS_MAP = {
-	"none|1": 0, "none|0": 0, "open|1": 1, "open|0": 1, "block|1": 4, "block|1": 14, "classic|1": 5, "classic|0": 17,
+	"none|1": 0, "none|0": 0, "open|1": 1, "open|0": 1, "block|0": 4, "block|1": 14, "classic|1": 5, "classic|0": 17,
 	"oval|1": 10, "oval|0": 20, "diamond|1": 11, "diamond|0": 22, "blockThin|1": 2, "blockThin|0": 2, "dash|1": 23, "dash|0": 23,
 	"ERone|1": 24, "ERone|0": 24, "ERmandOne|1": 25, "ERmandOne|0": 25, "ERmany|1": 27, "ERmany|0": 27, "ERoneToMany|1": 28, "ERoneToMany|0": 28,
-	"ERzeroToMany|1": 29, "ERzeroToMany|0": 29, "ERzeroToOne|1": 30, "ERzeroToOne|1": 30, "openAsync|1": 9, "openAsync|0": 9
+	"ERzeroToMany|1": 29, "ERzeroToMany|0": 29, "ERzeroToOne|1": 30, "ERzeroToOne|0": 30, "openAsync|1": 9, "openAsync|0": 9
 };