6 years ago · 4b771beabb
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
 
				+18-SEP-2019: 11.2.9
			
 
				+
			
 
				+- Adds pre and post config JS files
			
 
				+- Fixes page numbers in PDF export
			
 
				+- Adds globalVars to configuration
			
 
				+- Adds DRAWIO_CONFIG variable 
			
 
				+
			
 
				 08-SEP-2019: 11.2.8
			
 
				 
			
 
				 - Fixes bugs in PlantUML for Confluence Cloud
			
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
 
				-11.2.8
			
 
				+11.2.9
			
--- a/src/main/java/com/mxgraph/io/gliffy/importer/GliffyDiagramConverter.java
+++ b/src/main/java/com/mxgraph/io/gliffy/importer/GliffyDiagramConverter.java
@@ -1067,4 +1067,4 @@ public class GliffyDiagramConverter
 
				 	{

			
 
				 		this.report = report;

			
 
				 	}

			
 
				-}

			
 
				+}
			
--- a/src/main/java/com/mxgraph/online/GoogleAuthServlet.java
+++ b/src/main/java/com/mxgraph/online/GoogleAuthServlet.java
@@ -56,7 +56,12 @@ public class GoogleAuthServlet extends AbsAuthServlet
 
				 	{
			
 
				 		StringBuffer res = new StringBuffer();
			
 
				 		
			
 
				-		//Call the opener callback function directly with the given json
			
 
				+		//In Office Add-in, we don't have access to opened window to attach a function to it, 
			
 
				+		//	also with the redirect (since we had to open google auth in the same window) we lost Office Messaging.
			
 
				+		//	This is due to using Google own file picker instead of creating our own picker 
			
 
				+		//	(as we did with OneDrive since its picker only support popup windows which is not supported in Office)
			
 
				+		//	This is why we load drive.js which define onGDriveCallback and redirects automatically to the page including the picker
			
 
				+		//	For other scenarios, we use another function name (onGoogleDriveCallback)
			
 
				 		if (!jsonResponse)
			
 
				 		{
			
 
				 			res.append("<!DOCTYPE html><html><head>");
			
@@ -70,7 +75,12 @@ public class GoogleAuthServlet extends AbsAuthServlet
 
				 		if (!jsonResponse)
			
 
				 		{
			
 
				 			res.append(";");
			
 
				-			res.append("onGDriveCallback(authInfo);");
			
 
				+			res.append("if (window.opener != null && window.opener.onGoogleDriveCallback != null)"); 
			
 
				+			res.append("{");
			
 
				+			res.append("	window.opener.onGoogleDriveCallback(authInfo, window);");
			
 
				+			res.append("} else {");
			
 
				+			res.append("	onGDriveCallback(authInfo);");
			
 
				+			res.append("}");
			
 
				 			res.append("</script>");
			
 
				 			res.append("</head><body></body></html>");
			
 
				 		}
			
--- a/src/main/webapp/cache.manifest
+++ b/src/main/webapp/cache.manifest
@@ -1,7 +1,7 @@
 
				 CACHE MANIFEST
			
 
				 
			
 
				 # THIS FILE WAS GENERATED. DO NOT MODIFY!
			
 
				-# 09/08/2019 12:02 PM
			
 
				+# 09/17/2019 11:30 PM
			
 
				 
			
 
				 app.html
			
 
				 index.html?offline=1
			
--- a/src/main/webapp/export3.html
+++ b/src/main/webapp/export3.html
@@ -110,7 +110,7 @@
 
				 			//Add global variables to graph
			
 
				 			if (extras != null && extras.globalVars != null)
			
 
				 			{
			
 
				-				graph.globalUrlVars = extras.globalVars;
			
 
				+				graph.globalVars = extras.globalVars;
			
 
				 			}
			
 
				 
			
 
				 			/**
			
@@ -611,6 +611,28 @@
 
				 						to = isNaN(to)? from : Math.max(from, Math.min(to, diagrams.length - 1));
			
 
				 					}
			
 
				 				}
			
 
				+				else
			
 
				+				{
			
 
				+					/**
			
 
				+					 * Implements %page% and %pagenumber% placeholders
			
 
				+					 */
			
 
				+					var graphGetGlobalVariable = graph.getGlobalVariable;
			
 
				+					
			
 
				+					graph.getGlobalVariable = function(name)
			
 
				+					{
			
 
				+						if (name == 'page')
			
 
				+						{
			
 
				+							return (diagrams == null) ? 'Page-1' :
			
 
				+								(diagrams[from].getAttribute('name') || ('Page-' + (from + 1)));
			
 
				+						}
			
 
				+						else if (name == 'pagenumber')
			
 
				+						{
			
 
				+							return from + 1;
			
 
				+						}
			
 
				+						
			
 
				+						return graphGetGlobalVariable.apply(this, arguments);
			
 
				+					};
			
 
				+				}
			
 
				 					
			
 
				 				for (var i = from; i <= to; i++) 
			
 
				 				{
			
--- a/src/main/webapp/images/sidebar-mscae.png
+++ b/src/main/webapp/images/sidebar-mscae.png
--- a/src/main/webapp/img/lib/active_directory/active_directory.svg
+++ b/src/main/webapp/img/lib/active_directory/active_directory.svg
--- a/src/main/webapp/img/lib/active_directory/cd_dvd.svg
+++ b/src/main/webapp/img/lib/active_directory/cd_dvd.svg
--- a/src/main/webapp/img/lib/active_directory/cell_phone.svg
+++ b/src/main/webapp/img/lib/active_directory/cell_phone.svg
--- a/src/main/webapp/img/lib/active_directory/cluster_server.svg
+++ b/src/main/webapp/img/lib/active_directory/cluster_server.svg
--- a/src/main/webapp/img/lib/active_directory/community_discussion.svg
+++ b/src/main/webapp/img/lib/active_directory/community_discussion.svg
--- a/src/main/webapp/img/lib/active_directory/data_jack.svg
+++ b/src/main/webapp/img/lib/active_directory/data_jack.svg
--- a/src/main/webapp/img/lib/active_directory/database.svg
+++ b/src/main/webapp/img/lib/active_directory/database.svg
--- a/src/main/webapp/img/lib/active_directory/database_cube.svg
+++ b/src/main/webapp/img/lib/active_directory/database_cube.svg
--- a/src/main/webapp/img/lib/active_directory/database_partition_2.svg
+++ b/src/main/webapp/img/lib/active_directory/database_partition_2.svg
--- a/src/main/webapp/img/lib/active_directory/database_partition_3.svg
+++ b/src/main/webapp/img/lib/active_directory/database_partition_3.svg
--- a/src/main/webapp/img/lib/active_directory/database_partition_4.svg
+++ b/src/main/webapp/img/lib/active_directory/database_partition_4.svg
--- a/src/main/webapp/img/lib/active_directory/database_partition_5.svg
+++ b/src/main/webapp/img/lib/active_directory/database_partition_5.svg
--- a/src/main/webapp/img/lib/active_directory/database_server.svg
+++ b/src/main/webapp/img/lib/active_directory/database_server.svg
--- a/src/main/webapp/img/lib/active_directory/databases.svg
+++ b/src/main/webapp/img/lib/active_directory/databases.svg
--- a/src/main/webapp/img/lib/active_directory/documents.svg
+++ b/src/main/webapp/img/lib/active_directory/documents.svg
--- a/src/main/webapp/img/lib/active_directory/domain_controller.svg
+++ b/src/main/webapp/img/lib/active_directory/domain_controller.svg
--- a/src/main/webapp/img/lib/active_directory/fax.svg
+++ b/src/main/webapp/img/lib/active_directory/fax.svg
--- a/src/main/webapp/img/lib/active_directory/firewall.svg
+++ b/src/main/webapp/img/lib/active_directory/firewall.svg
--- a/src/main/webapp/img/lib/active_directory/folder.svg
+++ b/src/main/webapp/img/lib/active_directory/folder.svg
--- a/src/main/webapp/img/lib/active_directory/folder_open.svg
+++ b/src/main/webapp/img/lib/active_directory/folder_open.svg
--- a/src/main/webapp/img/lib/active_directory/generic_node.svg
+++ b/src/main/webapp/img/lib/active_directory/generic_node.svg
--- a/src/main/webapp/img/lib/active_directory/generic_server.svg
+++ b/src/main/webapp/img/lib/active_directory/generic_server.svg
--- a/src/main/webapp/img/lib/active_directory/hard_disk.svg
+++ b/src/main/webapp/img/lib/active_directory/hard_disk.svg
--- a/src/main/webapp/img/lib/active_directory/home.svg
+++ b/src/main/webapp/img/lib/active_directory/home.svg
--- a/src/main/webapp/img/lib/active_directory/home_page.svg
+++ b/src/main/webapp/img/lib/active_directory/home_page.svg
--- a/src/main/webapp/img/lib/active_directory/input_output_filter.svg
+++ b/src/main/webapp/img/lib/active_directory/input_output_filter.svg
--- a/src/main/webapp/img/lib/active_directory/interface.svg
+++ b/src/main/webapp/img/lib/active_directory/interface.svg
@@ -1,73 +1 @@
 
				-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
			
 
				-<!-- Created with Inkscape (http://www.inkscape.org/) -->
			
 
				-
			
 
				-<svg
			
 
				-   xmlns:dc="http://purl.org/dc/elements/1.1/"
			
 
				-   xmlns:cc="http://creativecommons.org/ns#"
			
 
				-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
			
 
				-   xmlns:svg="http://www.w3.org/2000/svg"
			
 
				-   xmlns="http://www.w3.org/2000/svg"
			
 
				-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
			
 
				-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
			
 
				-   width="90.848969mm"
			
 
				-   height="43.837399mm"
			
 
				-   viewBox="0 0 90.848969 43.837399"
			
 
				-   version="1.1"
			
 
				-   id="svg1997"
			
 
				-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
			
 
				-   sodipodi:docname="interface.svg">
			
 
				-  <defs
			
 
				-     id="defs1991" />
			
 
				-  <sodipodi:namedview
			
 
				-     id="base"
			
 
				-     pagecolor="#ffffff"
			
 
				-     bordercolor="#666666"
			
 
				-     borderopacity="1.0"
			
 
				-     inkscape:pageopacity="0.0"
			
 
				-     inkscape:pageshadow="2"
			
 
				-     inkscape:zoom="0.35"
			
 
				-     inkscape:cx="382.78317"
			
 
				-     inkscape:cy="-178.68708"
			
 
				-     inkscape:document-units="mm"
			
 
				-     inkscape:current-layer="layer1"
			
 
				-     showgrid="false"
			
 
				-     fit-margin-top="0"
			
 
				-     fit-margin-left="0"
			
 
				-     fit-margin-right="0"
			
 
				-     fit-margin-bottom="0"
			
 
				-     inkscape:window-width="1920"
			
 
				-     inkscape:window-height="1017"
			
 
				-     inkscape:window-x="-8"
			
 
				-     inkscape:window-y="-8"
			
 
				-     inkscape:window-maximized="1" />
			
 
				-  <metadata
			
 
				-     id="metadata1994">
			
 
				-    <rdf:RDF>
			
 
				-      <cc:Work
			
 
				-         rdf:about="">
			
 
				-        <dc:format>image/svg+xml</dc:format>
			
 
				-        <dc:type
			
 
				-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
			
 
				-        <dc:title></dc:title>
			
 
				-      </cc:Work>
			
 
				-    </rdf:RDF>
			
 
				-  </metadata>
			
 
				-  <g
			
 
				-     inkscape:label="Layer 1"
			
 
				-     inkscape:groupmode="layer"
			
 
				-     id="layer1"
			
 
				-     transform="translate(-59.959608,-127.10359)">
			
 
				-    <circle
			
 
				-       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#0066ff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
			
 
				-       id="path2010"
			
 
				-       cx="128.88988"
			
 
				-       cy="149.02229"
			
 
				-       r="19.918699" />
			
 
				-    <path
			
 
				-       style="opacity:1;fill:none;stroke:#0066ff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
			
 
				-       d="M 106.96727,148.26636 H 61.988093"
			
 
				-       id="path2012"
			
 
				-       inkscape:connector-curvature="0"
			
 
				-       sodipodi:nodetypes="cc" />
			
 
				-  </g>
			
 
				-</svg>
			
 
				+<svg xmlns="http://www.w3.org/2000/svg" width="343.366" height="165.683" viewBox="0 0 90.849 43.837" stroke="#06f" stroke-width="4"><circle cx="68.93" cy="21.918" r="19.919" fill="#fff" stroke-linejoin="round" paint-order="normal"/><path d="M47.007 21.162H2.028" fill="none" stroke-linecap="round"/></svg>
			
--- a/src/main/webapp/img/lib/active_directory/internet_cloud.svg
+++ b/src/main/webapp/img/lib/active_directory/internet_cloud.svg
--- a/src/main/webapp/img/lib/active_directory/internet_globe.svg
+++ b/src/main/webapp/img/lib/active_directory/internet_globe.svg
--- a/src/main/webapp/img/lib/active_directory/key.svg
+++ b/src/main/webapp/img/lib/active_directory/key.svg
--- a/src/main/webapp/img/lib/active_directory/laptop_client.svg
+++ b/src/main/webapp/img/lib/active_directory/laptop_client.svg
--- a/src/main/webapp/img/lib/active_directory/list.svg
+++ b/src/main/webapp/img/lib/active_directory/list.svg
--- a/src/main/webapp/img/lib/active_directory/mac_client.svg
+++ b/src/main/webapp/img/lib/active_directory/mac_client.svg
--- a/src/main/webapp/img/lib/active_directory/mainframe.svg
+++ b/src/main/webapp/img/lib/active_directory/mainframe.svg
--- a/src/main/webapp/img/lib/active_directory/mainframe_host.svg
+++ b/src/main/webapp/img/lib/active_directory/mainframe_host.svg
--- a/src/main/webapp/img/lib/active_directory/meeting.svg
+++ b/src/main/webapp/img/lib/active_directory/meeting.svg
--- a/src/main/webapp/img/lib/active_directory/modem.svg
+++ b/src/main/webapp/img/lib/active_directory/modem.svg
--- a/src/main/webapp/img/lib/active_directory/my_sites.svg
+++ b/src/main/webapp/img/lib/active_directory/my_sites.svg
--- a/src/main/webapp/img/lib/active_directory/not_secure.svg
+++ b/src/main/webapp/img/lib/active_directory/not_secure.svg
--- a/src/main/webapp/img/lib/active_directory/pda.svg
+++ b/src/main/webapp/img/lib/active_directory/pda.svg
--- a/src/main/webapp/img/lib/active_directory/phone.svg
+++ b/src/main/webapp/img/lib/active_directory/phone.svg
--- a/src/main/webapp/img/lib/active_directory/printer.svg
+++ b/src/main/webapp/img/lib/active_directory/printer.svg
--- a/src/main/webapp/img/lib/active_directory/router.svg
+++ b/src/main/webapp/img/lib/active_directory/router.svg
--- a/src/main/webapp/img/lib/active_directory/secure.svg
+++ b/src/main/webapp/img/lib/active_directory/secure.svg
--- a/src/main/webapp/img/lib/active_directory/security.svg
+++ b/src/main/webapp/img/lib/active_directory/security.svg
--- a/src/main/webapp/img/lib/active_directory/server_farm.svg
+++ b/src/main/webapp/img/lib/active_directory/server_farm.svg
--- a/src/main/webapp/img/lib/active_directory/shadowed_router.svg
+++ b/src/main/webapp/img/lib/active_directory/shadowed_router.svg
--- a/src/main/webapp/img/lib/active_directory/site_collection.svg
+++ b/src/main/webapp/img/lib/active_directory/site_collection.svg
--- a/src/main/webapp/img/lib/active_directory/sql_server.svg
+++ b/src/main/webapp/img/lib/active_directory/sql_server.svg
--- a/src/main/webapp/img/lib/active_directory/sub_site.svg
+++ b/src/main/webapp/img/lib/active_directory/sub_site.svg
--- a/src/main/webapp/img/lib/active_directory/switch.svg
+++ b/src/main/webapp/img/lib/active_directory/switch.svg
--- a/src/main/webapp/img/lib/active_directory/tablet_pc.svg
+++ b/src/main/webapp/img/lib/active_directory/tablet_pc.svg
--- a/src/main/webapp/img/lib/active_directory/tunnel.svg
+++ b/src/main/webapp/img/lib/active_directory/tunnel.svg
--- a/src/main/webapp/img/lib/active_directory/user.svg
+++ b/src/main/webapp/img/lib/active_directory/user.svg
--- a/src/main/webapp/img/lib/active_directory/user_accounts.svg
+++ b/src/main/webapp/img/lib/active_directory/user_accounts.svg
--- a/src/main/webapp/img/lib/active_directory/users.svg
+++ b/src/main/webapp/img/lib/active_directory/users.svg
--- a/src/main/webapp/img/lib/active_directory/vista_client.svg
+++ b/src/main/webapp/img/lib/active_directory/vista_client.svg
--- a/src/main/webapp/img/lib/active_directory/vista_terminal.svg
+++ b/src/main/webapp/img/lib/active_directory/vista_terminal.svg
--- a/src/main/webapp/img/lib/active_directory/web_server.svg
+++ b/src/main/webapp/img/lib/active_directory/web_server.svg
--- a/src/main/webapp/img/lib/active_directory/wiki_site.svg
+++ b/src/main/webapp/img/lib/active_directory/wiki_site.svg
--- a/src/main/webapp/img/lib/active_directory/windows_domain.svg
+++ b/src/main/webapp/img/lib/active_directory/windows_domain.svg
--- a/src/main/webapp/img/lib/active_directory/windows_router.svg
+++ b/src/main/webapp/img/lib/active_directory/windows_router.svg
--- a/src/main/webapp/img/lib/active_directory/windows_server.svg
+++ b/src/main/webapp/img/lib/active_directory/windows_server.svg
--- a/src/main/webapp/img/lib/active_directory/windows_server_2.svg
+++ b/src/main/webapp/img/lib/active_directory/windows_server_2.svg
--- a/src/main/webapp/img/lib/active_directory/wiring_hub.svg
+++ b/src/main/webapp/img/lib/active_directory/wiring_hub.svg
--- a/src/main/webapp/img/lib/active_directory/workspace_site.svg
+++ b/src/main/webapp/img/lib/active_directory/workspace_site.svg
--- a/src/main/webapp/img/lib/active_directory/workstation_client.svg
+++ b/src/main/webapp/img/lib/active_directory/workstation_client.svg
--- a/src/main/webapp/img/lib/active_directory/writer.svg
+++ b/src/main/webapp/img/lib/active_directory/writer.svg
--- a/src/main/webapp/img/lib/active_directory/writing.svg
+++ b/src/main/webapp/img/lib/active_directory/writing.svg
--- a/src/main/webapp/img/lib/allied_telesis/buildings/Apartments.svg
+++ b/src/main/webapp/img/lib/allied_telesis/buildings/Apartments.svg
--- a/src/main/webapp/img/lib/allied_telesis/buildings/Building_Cluster.svg
+++ b/src/main/webapp/img/lib/allied_telesis/buildings/Building_Cluster.svg
--- a/src/main/webapp/img/lib/allied_telesis/buildings/Large_Building.svg
+++ b/src/main/webapp/img/lib/allied_telesis/buildings/Large_Building.svg
--- a/src/main/webapp/img/lib/allied_telesis/buildings/Long_Building.svg
+++ b/src/main/webapp/img/lib/allied_telesis/buildings/Long_Building.svg
--- a/src/main/webapp/img/lib/allied_telesis/buildings/Medium_Business_Building.svg
+++ b/src/main/webapp/img/lib/allied_telesis/buildings/Medium_Business_Building.svg
--- a/src/main/webapp/img/lib/allied_telesis/buildings/School_Building.svg
+++ b/src/main/webapp/img/lib/allied_telesis/buildings/School_Building.svg
--- a/src/main/webapp/img/lib/allied_telesis/buildings/Secure_Building.svg
+++ b/src/main/webapp/img/lib/allied_telesis/buildings/Secure_Building.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/IP_TV.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/IP_TV.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Keypad.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Keypad.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Laptop.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Laptop.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/POS_Printer.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/POS_Printer.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/POS_keypad.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/POS_keypad.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Personal
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Personal
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Personal_Computer.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Personal_Computer.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Personal_Computer_Wireless.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Personal_Computer_Wireless.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Personal_Computer_with_Server.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Personal_Computer_with_Server.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Server_Desktop.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Server_Desktop.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Smartphone.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Smartphone.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Tablet.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Tablet.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Tablet_Alternative.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Tablet_Alternative.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/VOIP_IP_phone.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/VOIP_IP_phone.svg
--- a/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Vdeo_Conference_Terminal.svg
+++ b/src/main/webapp/img/lib/allied_telesis/computer_and_terminals/Vdeo_Conference_Terminal.svg
--- a/src/main/webapp/img/lib/allied_telesis/media_converters/Industrial_Media_Converter.svg
+++ b/src/main/webapp/img/lib/allied_telesis/media_converters/Industrial_Media_Converter.svg
--- a/src/main/webapp/img/lib/allied_telesis/media_converters/Industrial_Media_Converter_POE.svg
+++ b/src/main/webapp/img/lib/allied_telesis/media_converters/Industrial_Media_Converter_POE.svg
@@ -1 +1 @@
 				-11.2.8
 				+11.2.9