Bladeren bron

7.2.3 release

Gaudenz Alder 8 jaren geleden
bovenliggende
commit
8124348d18

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+24-AUG-2017: 7.2.3
+
+- Fixes reset of current styles
+
 24-AUG-2017: 7.2.2
 
 - Adds autosave for Trello files

+ 1 - 1
VERSION

@@ -1 +1 @@
-7.2.2
+7.2.3

+ 1 - 1
war/cache.manifest

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

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


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


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


+ 8 - 5
war/js/diagramly/App.js

@@ -1171,16 +1171,19 @@ App.prototype.init = function()
 //			'href="https://www.samepage.io/draw-diagram-online?SPcid=SIOF%2BDraw%2Breferral%2BDraw%2Bv1%2BNA"\>' +
 //			'<img border="0" align="absmiddle" width="24" height="24" style="margin-top:-2px;padding-right:8px;" ' +
 //			'src="' + IMAGE_PATH + '/samepage-icon-color.svg"/>Collaborate on diagrams in Samepage</a>';
-		td.innerHTML = '<a title="Trello integration" target="_blank" ' +
-			'href="https://www.facebook.com/drawioapp/posts/1635338883157308"\>' +
-			'<img border="0" align="absmiddle" width="24" height="24" style="margin-top:-2px;padding-right:8px;" ' +
-			'src="' + IMAGE_PATH + '/trello-logo.svg"/>NEW! Trello integration</a>';
+//		td.innerHTML = '<a title="Trello integration" target="_blank" ' +
+//			'href="https://www.facebook.com/drawioapp/posts/1635338883157308"\>' +
+//			'<img border="0" align="absmiddle" width="24" height="24" style="margin-top:-2px;padding-right:8px;" ' +
+//			'src="' + IMAGE_PATH + '/trello-logo.svg"/>NEW! Trello integration</a>';
+		td.innerHTML = '<a title="Line jumps now available" target="_blank" ' +
+			'href="https://www.facebook.com/drawioapp/posts/1636030279754835"\>' +
+			'<span style="color:red;">NEW!</span> Line jumps now available</a>';
 		
 		mxEvent.addListener(td, 'click', mxUtils.bind(this, function()
 		{
 			if (typeof window.ga === 'function' && !this.isOffline())
 			{
-				ga('send', 'event', 'Footer', 'click', 'Trello');
+				ga('send', 'event', 'Footer', 'click', 'Line jumps');
 			}
 		}));
 

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


+ 2 - 2
war/js/mxgraph/EditorUi.js

@@ -434,8 +434,8 @@ EditorUi = function(editor, container, lightbox)
 	
 	this.clearDefaultStyle = function()
 	{
-		graph.currentEdgeStyle = graph.defaultEdgeStyle;
-		graph.currentVertexStyle = graph.defaultVertexStyle;
+		graph.currentEdgeStyle = mxUtils.clone(graph.defaultEdgeStyle);
+		graph.currentVertexStyle = mxUtils.clone(graph.defaultVertexStyle);
 		
 		// Updates UI
 		this.fireEvent(new mxEventObject('styleChanged', 'keys', [], 'values', [], 'cells', []));

+ 13 - 21
war/js/mxgraph/Format.js

@@ -3334,6 +3334,7 @@ StyleFormatPanel.prototype.init = function()
 	}
 
 	this.container.appendChild(this.addStroke(this.createPanel()));
+	this.container.appendChild(this.addLineJumps(this.createPanel()));
 	var opacityPanel = this.createRelativeOption(mxResources.get('opacity'), mxConstants.STYLE_OPACITY, 41);
 	opacityPanel.style.paddingTop = '8px';
 	opacityPanel.style.paddingBottom = '8px';
@@ -4192,7 +4193,7 @@ StyleFormatPanel.prototype.addStroke = function(container)
 	this.listeners.push({destroy: function() { graph.getModel().removeListener(listener); }});
 	listener();
 
-	return this.addLineJumps(container);
+	return container;
 };
 
 /**
@@ -4204,35 +4205,24 @@ StyleFormatPanel.prototype.addLineJumps = function(container)
 	
 	if (Graph.lineJumpsEnabled && ss.edges.length > 0 && ss.vertices.length == 0)
 	{
+		container.style.padding = '8px 0px 24px 18px';
+		
 		var ui = this.editorUi;
 		var editor = ui.editor;
 		var graph = editor.graph;
 		
-		// Used if only edges selected
-		var stylePanel = document.createElement('div');
-		stylePanel.style.whiteSpace = 'nowrap';
-		stylePanel.style.padding = '8px 0px 10px 16px';
-		stylePanel.style.borderTop = '1px solid #c0c0c0';
-		stylePanel.style.overflow = 'visible';
-		stylePanel.style.position = 'relative';
-		stylePanel.style.left = '-16px';
-		stylePanel.style.top = '4px';
-		stylePanel.style.width = (ui.formatWidth) + 'px';
-		stylePanel.style.height = '12px';
-		stylePanel.className = 'geToolbarContainer';
-		
 		var span = document.createElement('div');
 		span.style.position = 'absolute';
 		span.style.fontWeight = 'bold';
-		span.style.width = '76px';
+		span.style.width = '80px';
 		
 		mxUtils.write(span, mxResources.get('lineJumps'));
-		stylePanel.appendChild(span);
+		container.appendChild(span);
 		
 		var styleSelect = document.createElement('select');
 		styleSelect.style.position = 'absolute';
 		styleSelect.style.marginTop = '-2px';
-		styleSelect.style.right = '92px';
+		styleSelect.style.right = '76px';
 		styleSelect.style.width = '62px';
 
 		var styles = ['none', 'arc', 'gap', 'sharp'];
@@ -4268,17 +4258,15 @@ StyleFormatPanel.prototype.addLineJumps = function(container)
 			mxEvent.consume(evt);
 		});
 		
-		stylePanel.appendChild(styleSelect);
+		container.appendChild(styleSelect);
 		
 		var jumpSizeUpdate;
 		
-		var jumpSize = this.addUnitInput(stylePanel, 'pt', 38, 33, function()
+		var jumpSize = this.addUnitInput(container, 'pt', 22, 33, function()
 		{
 			jumpSizeUpdate.apply(this, arguments);
 		});
 		
-		container.appendChild(stylePanel);
-		
 		jumpSizeUpdate = this.installInputHandler(jumpSize, 'jumpSize',
 			Graph.defaultJumpSize, 0, 999, ' pt');
 		
@@ -4300,6 +4288,10 @@ StyleFormatPanel.prototype.addLineJumps = function(container)
 		this.listeners.push({destroy: function() { graph.getModel().removeListener(listener); }});
 		listener();
 	}
+	else
+	{
+		container.style.display = 'none';
+	}
 	
 	return container;
 };

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

@@ -74,8 +74,8 @@ Graph = function(container, model, renderHint, stylesheet, themes)
 	mxGraph.call(this, container, model, renderHint, stylesheet);
 	
 	this.themes = themes || this.defaultThemes;
-	this.currentEdgeStyle = this.defaultEdgeStyle;
-	this.currentVertexStyle = this.defaultVertexStyle;
+	this.currentEdgeStyle = mxUtils.clone(this.defaultEdgeStyle);
+	this.currentVertexStyle = mxUtils.clone(this.defaultVertexStyle);
 
 	// Sets the base domain URL and domain path URL for relative links.
 	var b = this.baseUrl;

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


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