瀏覽代碼

7.1.2 release

Former-commit-id: 9e6fda708db103ad1a19f360515fcd6e1ec7bae5
Gaudenz Alder 8 年之前
父節點
當前提交
85219c4c6b
共有 12 個文件被更改,包括 354 次插入350 次删除
  1. 4 0
      ChangeLog
  2. 1 1
      VERSION
  3. 1 1
      war/cache.manifest
  4. 8 8
      war/js/app.min.js
  5. 126 126
      war/js/atlas-viewer.min.js
  6. 8 8
      war/js/atlas.min.js
  7. 37 37
      war/js/embed-static.min.js
  8. 3 1
      war/js/mxgraph/Shapes.js
  9. 37 37
      war/js/reader.min.js
  10. 2 2
      war/js/shapes.min.js
  11. 126 126
      war/js/viewer.min.js
  12. 1 3
      war/shapes/mxBasic.js

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+16-AUG-2017: 7.1.2
+
+- Fixes possible NPE in mxShapeBasicRectCallout shape
+
 16-AUG-2017: 7.1.1
 
 - Disables drafts in Confluence Cloud add-on

+ 1 - 1
VERSION

@@ -1 +1 @@
-7.1.1
+7.1.2

+ 1 - 1
war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 08/16/2017 08:32 AM
+# 08/16/2017 09:46 AM
 
 app.html
 index.html?offline=1

文件差異過大導致無法顯示
+ 8 - 8
war/js/app.min.js


文件差異過大導致無法顯示
+ 126 - 126
war/js/atlas-viewer.min.js


文件差異過大導致無法顯示
+ 8 - 8
war/js/atlas.min.js


文件差異過大導致無法顯示
+ 37 - 37
war/js/embed-static.min.js


+ 3 - 1
war/js/mxgraph/Shapes.js

@@ -1395,7 +1395,8 @@
 	{
 		return mxPerimeter.RectanglePerimeter(mxUtils.getDirectedBounds(bounds, new mxRectangle(0, 0, 0,
 			Math.max(0, Math.min(bounds.height, parseFloat(mxUtils.getValue(vertex.style, 'size',
-			CalloutShape.prototype.size))))), vertex.style), vertex, next, orthogonal);
+			CalloutShape.prototype.size)) * vertex.view.scale))),
+			vertex.style), vertex, next, orthogonal);
 	};
 	
 	mxStyleRegistry.putValue('calloutPerimeter', mxPerimeter.CalloutPerimeter);
@@ -3542,6 +3543,7 @@
 	// Defines connection points for all shapes
 	IsoRectangleShape.prototype.constraints = [];
 	IsoCubeShape.prototype.constraints = [];
+	CalloutShape.prototype.constraints = [];
 	mxRectangleShape.prototype.constraints = [new mxConnectionConstraint(new mxPoint(0.25, 0), true),
 	                                          new mxConnectionConstraint(new mxPoint(0.5, 0), true),
 	                                          new mxConnectionConstraint(new mxPoint(0.75, 0), true),

文件差異過大導致無法顯示
+ 37 - 37
war/js/reader.min.js


文件差異過大導致無法顯示
+ 2 - 2
war/js/shapes.min.js


文件差異過大導致無法顯示
+ 126 - 126
war/js/viewer.min.js


+ 1 - 3
war/shapes/mxBasic.js

@@ -127,7 +127,7 @@ mxShapeBasicRectCallout.prototype.getLabelMargins = function()
 		return new mxRectangle(0, 0, 0, parseFloat(mxUtils.getValue(this.style, 'dy', this.dy)) * this.scale);
 	}
 	
-	return new mxRectangle(rect.x, rect.y, rect.width, rect.height);
+	return null;
 };
 
 mxCellRenderer.registerShape(mxShapeBasicRectCallout.prototype.cst.RECT_CALLOUT, mxShapeBasicRectCallout);
@@ -242,8 +242,6 @@ Graph.handleFactory[mxShapeBasicRoundRectCallout.prototype.cst.ROUND_RECT_CALLOU
 	})];
 };
 
-mxShapeBasicRoundRectCallout.prototype.getLabelBounds = mxShapeBasicRectCallout.prototype.getLabelBounds;
-
 //**********************************************************************************************************************************************************
 // Wave
 //**********************************************************************************************************************************************************