瀏覽代碼

8.1.3 release

Gaudenz Alder 7 年之前
父節點
當前提交
b98a33fc01

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+12-FEB-2018: 8.1.3
+
+- Fixes dynamic loading for VSDX export
+- Fixes possible NPEs in VSDX export
+
 12-FEB-2018: 8.1.2
 
 - Adds resize option in image dialog

+ 1 - 1
VERSION

@@ -1 +1 @@
-8.1.2
+8.1.3

+ 1 - 0
etc/build/build.xml

@@ -231,6 +231,7 @@
 			<filelist dir="${basedir}" files="base-viewer.min.js,.tmp2.min.js"/>
     		</concat>
 
+		<delete file="${war.dir}/js/extensions.min.js"/>
 		<delete file="${basedir}/.tmp0.js"/>
 		<delete file="${basedir}/.tmp0.min.js"/>
 		<delete file="${basedir}/.tmp1.js"/>

+ 1 - 1
src/main/webapp/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 02/12/2018 02:49 PM
+# 02/12/2018 04:53 PM
 
 app.html
 index.html?offline=1

文件差異過大導致無法顯示
+ 2 - 2
src/main/webapp/js/app.min.js


文件差異過大導致無法顯示
+ 1 - 1
src/main/webapp/js/atlas-viewer.min.js


文件差異過大導致無法顯示
+ 5 - 5
src/main/webapp/js/atlas.min.js


+ 1 - 1
src/main/webapp/js/diagramly/EditorUi.js

@@ -5426,7 +5426,7 @@
 			}
 		});
 		
-		if (typeof VsdxExport  !== 'undefined' && !this.loadingExtensions && !this.isOffline())
+		if (typeof VsdxExport === 'undefined' && !this.loadingExtensions && !this.isOffline())
 		{
 			this.loadingExtensions = true;
 			mxscript('js/extensions.min.js', delayed);

+ 5 - 0
src/main/webapp/js/diagramly/vsdx/VsdxExport.js

@@ -392,6 +392,11 @@ function VsdxExport(editorUi)
 	{
 		var state = graph.view.getState(cell);
 		
+		if (state == null)
+		{
+			return null;
+		}
+		
 		var shape = createElt(xmlDoc, that.XMLNS, "Shape");
 		var vsdxId = getCellVsdxId(cell.id);
 		shape.setAttribute("ID", vsdxId);

+ 9 - 4
src/main/webapp/js/diagramly/vsdx/mxVsdxCanvas2D.js

@@ -921,12 +921,17 @@ mxVsdxCanvas2D.prototype.text = function(x, y, w, h, str, align, valign, wrap, f
 		};
 		
 		if (format == 'html' && mxClient.IS_SVG)
-    	{
+		{
 			//Get the actual HTML label node
-			var ch = this.cellState.text.node.getElementsByTagName('div')[mxClient.NO_FO? 0 : 1].childNodes;
+			var elt = this.cellState.text.node.getElementsByTagName('div')[mxClient.NO_FO? 0 : 1];
 			
-			processNodeChildren(ch, {});
-    	}
+			if (elt != null)
+			{
+				var ch = elt.childNodes;
+				
+				processNodeChildren(ch, {});
+			}
+		}
 		else
 		{
 			//If it is not HTML or SVG, we fall back to removing html format

文件差異過大導致無法顯示
+ 1 - 1
src/main/webapp/js/embed-static.min.js


文件差異過大導致無法顯示
+ 3 - 3
src/main/webapp/js/extensions.min.js


文件差異過大導致無法顯示
+ 1 - 1
src/main/webapp/js/reader.min.js


文件差異過大導致無法顯示
+ 1 - 1
src/main/webapp/js/viewer.min.js