浏览代码

6.9.4 release

Gaudenz Alder 8 年之前
父节点
当前提交
718e2520d4

+ 9 - 0
ChangeLog

@@ -1,3 +1,12 @@
+24-JUL-2017: 6.9.4
+
+- Fixes hyperlinks in viewer
+
+24-JUL-2017: 6.9.3
+
+- Uses mxGraph 3.7.5 beta 5
+- Add experimental support for bridges in dev mode only
+
 24-JUL-2017: 6.9.2
 
 - Add experimental support for bridges

+ 1 - 1
VERSION

@@ -1 +1 @@
-6.9.2
+6.9.4

+ 0 - 2
etc/build/build.xml

@@ -234,7 +234,6 @@
 				<file name="EditorUi.js" />
 				<file name="Settings.js" />
 				<file name="App.js" />
-				<file name="mxEdgeBridge.js" />
 				<file name="Menus.js" />
 				<file name="Pages.js" />
 			</sources>
@@ -317,7 +316,6 @@
 			
 			<sources dir="${war.dir}/js/diagramly">
 				<file name="App.js" />
-				<file name="mxEdgeBridge.js" />
 				<file name="Menus.js" />
 				<file name="Pages.js" />
 			</sources>

文件差异内容过多而无法显示
+ 3 - 3
etc/mxgraph/mxClient.js


+ 1 - 1
war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 07/24/2017 12:47 AM
+# 07/24/2017 07:13 AM
 
 app.html
 index.html?offline=1

+ 1 - 1
war/index.html

@@ -399,7 +399,7 @@
 	</div>
 	<table align="center">
 		<tr>
-			<td id="geFooterItem2" style="width:246px;">
+			<td id="geFooterItem2" align="center" style="width:246px;">
 				<a title="Quick Start Video" href="https://www.youtube.com/watch?v=Z0D96ZikMkc" target="_blank">
 					<img border="0" align="absmiddle" style="margin-top:-3px;padding-right:8px;"
 						src="images/glyphicons_youtube_red.png"/>Quick Start Video</a>

文件差异内容过多而无法显示
+ 65 - 67
war/js/app.min.js


文件差异内容过多而无法显示
+ 41 - 40
war/js/atlas-viewer.min.js


文件差异内容过多而无法显示
+ 448 - 450
war/js/atlas.min.js


+ 2 - 2
war/js/diagramly/mxEdgeBridge.js

@@ -112,9 +112,9 @@ mxConnector.prototype.paintLine = function(canvas, pts, rounded)
         	  {
         		  var eState = graph.view.getState(edge);
         		  
-        		  if (eState.absolutePoints != null) 
+        		  if (eState != null && eState.absolutePoints != null) 
         		  {
-                    var eScale = eState.shape.scale;
+                    var eScale = eState.view.scale;
                     
                     for (var j = 0; j < eState.absolutePoints.length - 1; j++)
               	  	{

文件差异内容过多而无法显示
+ 41 - 40
war/js/embed-static.min.js


+ 4 - 4
war/js/mxgraph/Graph.js

@@ -993,6 +993,7 @@ Graph.prototype.init = function(container)
 		
 		var down = mxUtils.bind(this, function(evt)
 		{
+			handleClick = true;
 			first = new mxPoint(mxEvent.getClientX(evt), mxEvent.getClientY(evt));
 		});
 		
@@ -1011,7 +1012,7 @@ Graph.prototype.init = function(container)
 				
 				while (elt != null && elt != shape.node)
 				{
-					if (elt.nodeName == 'A')
+					if (elt.nodeName.toLowerCase() == 'a')
 					{
 						state.view.graph.labelLinkClicked(state, elt, evt);
 						break;
@@ -1020,9 +1021,6 @@ Graph.prototype.init = function(container)
 					elt = elt.parentNode;
 				}
 			}
-			
-			handleClick = true;
-			first = null;
 		});
 		
 		mxEvent.addGestureListeners(shape.node, down, move, up);
@@ -4518,6 +4516,7 @@ if (typeof mxVertexHandler != 'undefined')
 									mxEvent.addListener(links[i], 'click', function(evt)
 									{
 										mxEvent.consume(evt);
+										console.log('consumed');
 									});
 								}
 								else
@@ -4647,6 +4646,7 @@ if (typeof mxVertexHandler != 'undefined')
 								}
 					    		
 					    		me.consume();
+								console.log('consumed');
 				    		}
 				    	}
 				    	else if (onClick != null && !me.isConsumed() &&

文件差异内容过多而无法显示
+ 41 - 40
war/js/reader.min.js


文件差异内容过多而无法显示
+ 41 - 40
war/js/viewer.min.js