Browse Source

8.7.5 release

Gaudenz Alder 7 years ago
parent
commit
dcf1daaf18

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+05-JUN-2018: 8.7.5
+
+- Uses mxGraph 3.9.7 beta 2
+- Uses mxgraph-core 3.9.6
+
 03-JUN-2018: 8.7.4
 
 - Fixes possible SSRF in proxy servlet

+ 1 - 1
VERSION

@@ -1 +1 @@
-8.7.4
+8.7.5

File diff suppressed because it is too large
+ 12 - 12
etc/mxgraph/mxClient.js


+ 2 - 2
src/main/java/com/mxgraph/online/GitHubServlet.java

@@ -39,12 +39,12 @@ public class GitHubServlet extends HttpServlet
 	/**
 	 * 
 	 */
-	private static String DEV_CLIENT_SECRET = "be6810bd6b8d6a47c65a8b141e0dce8aaabcd4f5";
+	private static String DEV_CLIENT_SECRET = null;
 
 	/**
 	 * 
 	 */
-	private static String CLIENT_SECRET = "6fb1cff7690db9ac066db5bbde8e3c078efdabcf";
+	private static String CLIENT_SECRET = null;
 
 	/**
 	 * @see HttpServlet#HttpServlet()

+ 0 - 1
src/main/webapp/WEB-INF/iconfinder_key

@@ -1 +0,0 @@
-Replace_with_your_own_iconfinder_key

BIN
src/main/webapp/WEB-INF/lib/mxgraph-core.jar


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

@@ -1,7 +1,7 @@
 CACHE MANIFEST
 
 # THIS FILE WAS GENERATED. DO NOT MODIFY!
-# 06/03/2018 08:54 AM
+# 06/05/2018 07:59 AM
 
 app.html
 index.html?offline=1

File diff suppressed because it is too large
+ 139 - 139
src/main/webapp/js/app.min.js


File diff suppressed because it is too large
+ 137 - 137
src/main/webapp/js/atlas-viewer.min.js


File diff suppressed because it is too large
+ 139 - 139
src/main/webapp/js/atlas.min.js


+ 26 - 25
src/main/webapp/js/diagramly/EditorUi.js

@@ -507,7 +507,8 @@
 		    	{
 		    		// Gets compressed data from mxgraph element in HTML document
 					var doc = mxUtils.parseXml(data);
-					var node = this.editor.extractGraphModel(doc.documentElement, this.pages != null);
+					var node = this.editor.extractGraphModel(doc.documentElement, this.pages != null ||
+						this.diagramContainer.style.visibility == 'hidden');
 					result = (node != null) ? mxUtils.getXml(node) : '';
 		    	}
 			}
@@ -8441,29 +8442,29 @@
 									}
 									else
 									{
-									    	var data = null;
-									    	
-									    	if (mxUtils.indexOf(provider.types, 'text/uri-list') >= 0)
-									    	{
-									    		var data = evt.dataTransfer.getData('text/uri-list');
-									    	}
-									    	else
-									    	{
-									    		data = (mxUtils.indexOf(provider.types, 'text/html') >= 0) ? provider.getData('text/html') : null;
-									    	}
+								    	var data = null;
+								    	
+								    	if (mxUtils.indexOf(provider.types, 'text/uri-list') >= 0)
+								    	{
+								    		var data = evt.dataTransfer.getData('text/uri-list');
+								    	}
+								    	else
+								    	{
+								    		data = (mxUtils.indexOf(provider.types, 'text/html') >= 0) ? provider.getData('text/html') : null;
+								    	}
 										
 										if (data != null && data.length > 0)
 										{
 											var div = document.createElement('div');
-									    		div.innerHTML = data;
-			
-									    		// Extracts single image
-									    		var imgs = div.getElementsByTagName('img');
-									    		
-									    		if (imgs.length > 0)
-									    		{
-									    			data = imgs[0].getAttribute('src');
-									    		}
+								    		div.innerHTML = data;
+		
+								    		// Extracts single image
+								    		var imgs = div.getElementsByTagName('img');
+								    		
+								    		if (imgs.length > 0)
+								    		{
+								    			data = imgs[0].getAttribute('src');
+								    		}
 										}
 										else if (mxUtils.indexOf(provider.types, 'text/plain') >= 0)
 										{
@@ -8485,12 +8486,12 @@
 										}
 										else if (!this.isOffline() && this.isRemoteFileFormat(data))
 										{
-								    			new mxXmlRequest(OPEN_URL, 'format=xml&data=' + encodeURIComponent(data)).send(mxUtils.bind(this, function(req)
+								    		new mxXmlRequest(OPEN_URL, 'format=xml&data=' + encodeURIComponent(data)).send(mxUtils.bind(this, function(req)
 											{
-									    			if (req.getStatus() >= 200 && req.getStatus() <= 299)
-									    			{
-									    				this.openLocalFile(req.getText(), null, true);
-									    			}
+								    			if (req.getStatus() >= 200 && req.getStatus() <= 299)
+								    			{
+								    				this.openLocalFile(req.getText(), null, true);
+								    			}
 											}));
 										}
 										else if (/^https?:\/\//.test(data))

+ 1 - 1
src/main/webapp/js/diagramly/sidebar/Sidebar.js

@@ -1105,7 +1105,7 @@
 				{
 					var pg = page - Math.ceil((len - count / 4) / count);
 	
-					mxUtils.get(ICONSEARCH_PATH + '?v=2&q=' + encodeURIComponent(searchTerms) +
+					mxUtils.get(ICONSEARCH_PATH + '?q=' + encodeURIComponent(searchTerms) +
 						'&p=' + pg + '&c=' + count, mxUtils.bind(this, function(req)
 					{
 						try

File diff suppressed because it is too large
+ 13 - 13
src/main/webapp/js/embed-static.min.js


+ 3 - 0
src/main/webapp/js/mxgraph/Graph.js

@@ -567,6 +567,9 @@ Graph = function(container, model, renderHint, stylesheet, themes)
 	    };
 
 	    // Activates outline connect after 1500ms with touch event or if alt is pressed inside the shape
+	    // outlineConnect=0 is a custom style that means do not connect to strokes inside the shape,
+	    // or in other words, connect to the shape's perimeter if the highlight is under the mouse
+	    // (the name is because the highlight, including all strokes, is called outline in the code)
 	    var connectionHandleIsOutlineConnectEvent = this.connectionHandler.isOutlineConnectEvent;
 	    
 	    this.connectionHandler.isOutlineConnectEvent = function(me)

File diff suppressed because it is too large
+ 13 - 13
src/main/webapp/js/reader.min.js


File diff suppressed because it is too large
+ 137 - 137
src/main/webapp/js/viewer.min.js