Browse Source

7.3.2 release

Former-commit-id: 6b7bb92b2e521e796e0bd95507699bcd7038d981
Gaudenz Alder 8 years ago
parent
commit
7ffbadba71
11 changed files with 1842 additions and 1811 deletions
  1. 4 0
      ChangeLog
  2. 1 1
      VERSION
  3. 1 1
      war/cache.manifest
  4. 369 367
      war/js/app.min.js
  5. 286 285
      war/js/atlas-viewer.min.js
  6. 367 366
      war/js/atlas.min.js
  7. 10 1
      war/js/diagramly/TrelloClient.js
  8. 243 242
      war/js/embed-static.min.js
  9. 32 21
      war/js/mxgraph/Graph.js
  10. 243 242
      war/js/reader.min.js
  11. 286 285
      war/js/viewer.min.js

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+31-AUG-2017: 7.3.2
+
+- Fixes special cases for line jumps
+
 30-AUG-2017: 7.3.1
 
 - Fixes folder dialog for inserting new Google Drive files

+ 1 - 1
VERSION

@@ -1 +1 @@
-7.3.1
+7.3.2

+ 1 - 1
war/cache.manifest

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 08/30/2017 08:50 AM
+# 08/31/2017 10:01 AM
 
 app.html
 index.html?offline=1

File diff suppressed because it is too large
+ 369 - 367
war/js/app.min.js


File diff suppressed because it is too large
+ 286 - 285
war/js/atlas-viewer.min.js


File diff suppressed because it is too large
+ 367 - 366
war/js/atlas.min.js


+ 10 - 1
war/js/diagramly/TrelloClient.js

@@ -591,7 +591,16 @@ TrelloClient.prototype.showTrelloDialog = function(showFiles, fn)
 TrelloClient.prototype.isAuthorized = function()
 {
 	//TODO this may break if Trello client.js is changed
-	return localStorage['trello_token'] != null; //Trello.authorized(); doesn't work unless authorize is called first
+	try
+	{
+		return localStorage['trello_token'] != null; //Trello.authorized(); doesn't work unless authorize is called first
+	}
+	catch (e)
+	{
+		// ignores access denied
+	}
+	
+	return false;
 };
 
 

File diff suppressed because it is too large
+ 243 - 242
war/js/embed-static.min.js


+ 32 - 21
war/js/mxgraph/Graph.js

@@ -3419,17 +3419,16 @@ HoverIcons.prototype.setCurrentState = function(state)
 					var p0 = pts[i];
 					var list = [];
 					
-					// Ignores waypoint on straight segments
-					if (i < pts.length - 2)
+					// Ignores waypoints on straight segments
+					var pn = pts[i + 2];
+					
+					while (i < pts.length - 2 &&
+						mxUtils.ptSegDistSq(p0.x, p0.y, pn.x, pn.y,
+						p1.x, p1.y) < 1 * this.scale * this.scale)
 					{
-						var pn = pts[i + 2];
-						
-						if (mxUtils.ptSegDistSq(p0.x, p0.y, pn.x, pn.y,
-							p1.x, p1.y) < 1 * this.scale * this.scale)
-						{
-							p1 = pn;
-							i++;
-						}
+						p1 = pn;
+						i++;
+						pn = pts[i + 2];
 					}
 					
 					changed = addPoint(0, p0.x, p0.y) || changed;
@@ -3439,15 +3438,27 @@ HoverIcons.prototype.setCurrentState = function(state)
 					{
 						var state2 = this.validEdges[e];
 						var pts2 = state2.absolutePoints;
-						var added = false;
 						
-						if (pts2 != null)
+						if (pts2 != null && mxUtils.intersects(state, state2))
 						{
 							// Compares each segment of the edge with the current segment
 							for (var j = 0; j < pts2.length - 1; j++)
 							{
-								var p2 = pts2[j];
 								var p3 = pts2[j + 1];
+								var p2 = pts2[j];
+								
+								// Ignores waypoints on straight segments
+								pn = pts2[j + 2];
+								
+								while (j < pts2.length - 2 &&
+									mxUtils.ptSegDistSq(p2.x, p2.y, pn.x, pn.y,
+									p3.x, p3.y) < 1 * this.scale * this.scale)
+								{
+									p3 = pn;
+									j++;
+									pn = pts2[j + 2];
+								}
+								
 								var pt = mxUtils.intersection(p0.x, p0.y, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y);
 	
 								// Handles intersection between two segments
@@ -3555,6 +3566,12 @@ HoverIcons.prototype.setCurrentState = function(state)
 				// Type 1 is an intersection
 				if (last != null && rpt.type == 1)
 				{
+					// Checks if next/previous points are too close
+					var next = this.state.routedPoints[i + 1];
+					var dx = next.x / this.scale - pt.x;
+					var dy = next.y / this.scale - pt.y;
+					var dist = dx * dx + dy * dy;
+
 					if (n == null)
 					{
 						n = new mxPoint(pt.x - last.x, pt.y - last.y);
@@ -3563,12 +3580,6 @@ HoverIcons.prototype.setCurrentState = function(state)
 						n.y = n.y * size / len;
 					}
 					
-					// Checks if next/previous points are too close
-					var next = this.state.routedPoints[i + 1];
-					var dx = next.x / this.scale - pt.x;
-					var dy = next.y / this.scale - pt.y;
-					var dist = dx * dx + dy * dy;
-					
 					if (dist > size * size && len > 0)
 					{
 						var dx = last.x - pt.x;
@@ -3804,8 +3815,6 @@ mxStencilRegistry.getStencil = function(name)
 			{
 				if (mxStencilRegistry.packages[basename] == null)
 				{
-					mxStencilRegistry.packages[basename] = 1;
-					
 					for (var i = 0; i < libs.length; i++)
 					{
 						var fname = libs[i];
@@ -3841,6 +3850,8 @@ mxStencilRegistry.getStencil = function(name)
 							//mxResources.add(fname);
 						}
 					}
+
+					mxStencilRegistry.packages[basename] = 1;
 				}
 			}
 			else

File diff suppressed because it is too large
+ 243 - 242
war/js/reader.min.js


File diff suppressed because it is too large
+ 286 - 285
war/js/viewer.min.js