From 288f3ebbce6b17cd3a0457507c8999b726fe8b3a Mon Sep 17 00:00:00 2001 From: mvonhasselbach Date: Tue, 26 Oct 2021 10:54:44 +0200 Subject: [PATCH 1/6] Rename EdgeStyle widget property Rename EdgeStyle widget property so that it doesn't get picked up by the SolutionCentral packaging dependency resolution as a Style Entity --- src/mxdiagram.runtime.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mxdiagram.runtime.ts b/src/mxdiagram.runtime.ts index c534085..2dd230c 100644 --- a/src/mxdiagram.runtime.ts +++ b/src/mxdiagram.runtime.ts @@ -61,7 +61,7 @@ TW.Runtime.Widgets.mxdiagram = function () { this.resetCurrentGraph(); let container = this.jqElement[0]; let currentGraph = xmlDiagramLoader.createGraphFromXML(container, updatePropertyInfo.SinglePropertyValue, - this.getProperty("CustomShapesXMLPath"), this.getProperty("AutoLayout"), this.getProperty("EdgeStyle")); + this.getProperty("CustomShapesXMLPath"), this.getProperty("AutoLayout"), this.getProperty("EdgeStyleType")); this.setNewActiveGraph(currentGraph); break; } From 38b2c82ce09b110089e7843ab540c4be7ca909c6 Mon Sep 17 00:00:00 2001 From: mvonhasselbach Date: Tue, 26 Oct 2021 10:57:09 +0200 Subject: [PATCH 2/6] Update mxdiagram.ide.ts --- src/mxdiagram.ide.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mxdiagram.ide.ts b/src/mxdiagram.ide.ts index 3de51ad..2753c4e 100644 --- a/src/mxdiagram.ide.ts +++ b/src/mxdiagram.ide.ts @@ -130,7 +130,7 @@ TW.IDE.Widgets.mxdiagram = function () { }, ] }, - 'EdgeStyle': { + 'EdgeStyleValue': { 'description': 'The edge style to be applied to loaded XML.', 'baseType': 'STRING', 'defaultValue': 'None', @@ -195,4 +195,4 @@ TW.IDE.Widgets.mxdiagram = function () { return '
'; }; -} \ No newline at end of file +} From ec42f213634528393ac43eabab7679e9acba1023 Mon Sep 17 00:00:00 2001 From: mvonhasselbach Date: Tue, 26 Oct 2021 10:57:39 +0200 Subject: [PATCH 3/6] Update mxdiagram.runtime.ts --- src/mxdiagram.runtime.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mxdiagram.runtime.ts b/src/mxdiagram.runtime.ts index 2dd230c..f4f1738 100644 --- a/src/mxdiagram.runtime.ts +++ b/src/mxdiagram.runtime.ts @@ -61,7 +61,7 @@ TW.Runtime.Widgets.mxdiagram = function () { this.resetCurrentGraph(); let container = this.jqElement[0]; let currentGraph = xmlDiagramLoader.createGraphFromXML(container, updatePropertyInfo.SinglePropertyValue, - this.getProperty("CustomShapesXMLPath"), this.getProperty("AutoLayout"), this.getProperty("EdgeStyleType")); + this.getProperty("CustomShapesXMLPath"), this.getProperty("AutoLayout"), this.getProperty("EdgeStyleValue")); this.setNewActiveGraph(currentGraph); break; } From f6f6ceed4a25df38c53e19e23fe67521ace1493f Mon Sep 17 00:00:00 2001 From: mvonhasselbach Date: Tue, 26 Oct 2021 11:01:48 +0200 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 201bdb4..c757599 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The main entry point for the widget is the `XMLDiagram` property. This represent * `JSONArrayGraphCells`: Override allowing you to do state formatting on the element. It should be an JSON object containing id, value, fillColor and strokeColor. * `SelectedCellId`: The Id of the currently selected cell. * `AutoLayout`: The layout algorithm to be applied in the cells in the diagram. By default, no algorithm is selected, meaning that the positions of the cells in the XML are respected. If one algorithm is selected, the graph will be organized acording to that layout. -* `EdgeStyle`: Override the edge style algorithm in the XML. Usually used toghether with `AutoLayout`, allows for generation of good looking edged between cells. +* `EdgeStyleValue`: Override the edge style algorithm in the XML. Usually used toghether with `AutoLayout`, allows for generation of good looking edged between cells. The following events are also available: From ee5c39664bf96aa720788c364aef05371b8d9b39 Mon Sep 17 00:00:00 2001 From: mvonhasselbach Date: Tue, 26 Oct 2021 11:07:30 +0200 Subject: [PATCH 5/6] Cleaned-up broken links in Readme.md Removed example image links --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index c757599..b050fc9 100644 --- a/README.md +++ b/README.md @@ -49,12 +49,8 @@ The following commands allow you to build and compile your widget: # Gallery -![mxGraph](demo/img/mxGraph1.png) - ![mxGraph](demo/img/mxGraph2.png) -![mxGraph](demo/img/mxGraph3.png) - # Credit/Acknowledgment Petrisor Lacatus (@stefan-lacatus) From bbc7a1de36e0a2a2b3652d792d2a027c8571e107 Mon Sep 17 00:00:00 2001 From: mvonhasselbach Date: Tue, 26 Oct 2021 17:50:13 +0200 Subject: [PATCH 6/6] Update package.json incremented extension version number --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f248bbb..ff1f0d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mxdiagram", - "version": "0.0.300", + "version": "0.0.301", "description": "Widget to display draw.io diagrams or value process diagrams", "thingworxServer": "http://localhost:8016/", "thingworxUser": "Administrator", @@ -58,4 +58,4 @@ "jjgraph": "github:stefan-lacatus/jjgraph#master", "pako": "^1.0.6" } -} \ No newline at end of file +}