From fe7ac7e84d63d5ba9d5e62bf757e2683716e43b3 Mon Sep 17 00:00:00 2001 From: mcyph <20507948+mcyph@users.noreply.github.com> Date: Sun, 2 May 2021 23:56:17 +1000 Subject: [PATCH] bugfixes --- docs/stashed/Map.js | 4 ++-- docs/stashed/Ports.js | 14 +++++++------- docs/stashed/Schema.js | 6 +++--- docs/stashed/Scrollbars.js | 2 +- docs/stashed/grapheditor/www/js/EditorUi.js | 2 +- packages/html/stories/Boundary.stories.js | 2 +- packages/html/stories/Images.stories.js | 2 +- packages/html/stories/Merge.stories.js | 6 +++--- packages/html/stories/Monitor.stories.js | 8 ++++---- packages/html/stories/OrgChart.stories.js | 2 +- packages/html/stories/Stylesheet.stories.js | 2 +- packages/html/stories/SwimLanes.stories.js | 4 ++-- packages/html/stories/UserObject.stories.js | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/stashed/Map.js b/docs/stashed/Map.js index 0ff4a3272..5369852eb 100644 --- a/docs/stashed/Map.js +++ b/docs/stashed/Map.js @@ -145,8 +145,8 @@ export default Map; style.perimiter = mxPerimeter.EllipsePerimeter; style.fillColor = '#8CCDF5'; style.strokeColor = '#1B78C8'; - style.strokeColor = '#000000'; - style['opacity'] = '50'; + style.fontColor = '#000000'; + style.opacity = '50'; style.fontSize = '16'; graph.getStylesheet().putDefaultVertexStyle(style); diff --git a/docs/stashed/Ports.js b/docs/stashed/Ports.js index f46b1aa50..aabbac404 100644 --- a/docs/stashed/Ports.js +++ b/docs/stashed/Ports.js @@ -523,9 +523,9 @@ export default Ports; style.gradientColor = '#41B9F5'; style.fillColor = '#8CCDF5'; style.strokeColor = '#1B78C8'; - style.strokeColor = '#000000'; + style.fontColor = '#000000'; style.rounded = true; - style['opacity'] = '80'; + style.opacity = '80'; style.fontSize = '12'; style.fontStyle = 0; style.imageWidth = '48'; @@ -545,14 +545,14 @@ export default Ports; style.gradientColor = '#7d85df'; style.strokeColor = '#5d65df'; style.fillColor = '#adc5ff'; - style.strokeColor = '#1d258f'; + style.fontColor = '#1d258f'; style.fontFamily = 'Verdana'; style.fontSize = '12'; style.fontStyle = '1'; style.rounded = '1'; style.imageWidth = '48'; style.imageHeight = '48'; - style['opacity'] = '80'; + style.opacity = '80'; graph.getStylesheet().putDefaultVertexStyle(style);*/ style = {}; @@ -563,9 +563,9 @@ export default Ports; style.fillColor = '#FF9103'; style.gradientColor = '#F8C48B'; style.strokeColor = '#E86A00'; - style.strokeColor = '#000000'; + style.fontColor = '#000000'; style.rounded = true; - style['opacity'] = '80'; + style.opacity = '80'; style.startSize = '30'; style.fontSize = '16'; style.fontStyle = 1; @@ -573,7 +573,7 @@ export default Ports; style = {}; style.shape = mxConstants.SHAPE_IMAGE; - style.strokeColor = '#774400'; + style.fontColor = '#774400'; style.perimiter = mxPerimeter.RectanglePerimeter; style.perimeterSpacing = '6'; style.align = mxConstants.ALIGN_LEFT; diff --git a/docs/stashed/Schema.js b/docs/stashed/Schema.js index 41d73f9c3..ac37270fb 100644 --- a/docs/stashed/Schema.js +++ b/docs/stashed/Schema.js @@ -652,7 +652,7 @@ export default MYNAMEHERE; style.perimiter = mxPerimeter.RectanglePerimeter; style.align = mxConstants.ALIGN_LEFT; style.verticalAlign = mxConstants.ALIGN_MIDDLE; - style.strokeColor = '#000000'; + style.fontColor = '#000000'; style.fontSize = '11'; style.fontStyle = 0; style.spacingLeft = '4'; @@ -669,7 +669,7 @@ export default MYNAMEHERE; style.fillColor = '#8CCDF5'; style['swimlaneFillColor'] = '#ffffff'; style.strokeColor = '#1B78C8'; - style.strokeColor = '#000000'; + style.fontColor = '#000000'; style.strokeWidth = '2'; style.startSize = '28'; style.verticalAlign = 'middle'; @@ -677,7 +677,7 @@ export default MYNAMEHERE; style.fontStyle = 1; style.image = 'images/icons48/table.png'; // Looks better without opacity if shadow is enabled - //style['opacity'] = '80'; + //style.opacity = '80'; style.shadow = 1; graph.getStylesheet().putCellStyle('table', style); diff --git a/docs/stashed/Scrollbars.js b/docs/stashed/Scrollbars.js index 6dad0a4a8..feb5f8dea 100644 --- a/docs/stashed/Scrollbars.js +++ b/docs/stashed/Scrollbars.js @@ -184,7 +184,7 @@ export default Scrollbars; graph.stylesheet.getDefaultEdgeStyle().edge = mxEdgeStyle.EntityRelation; graph.stylesheet.getDefaultEdgeStyle().strokeColor = 'black'; - graph.stylesheet.getDefaultEdgeStyle().strokeColor = 'black'; + graph.stylesheet.getDefaultEdgeStyle().fontColor = 'black'; // Allows new connections to be made but do not allow existing // connections to be changed for the sake of simplicity of this diff --git a/docs/stashed/grapheditor/www/js/EditorUi.js b/docs/stashed/grapheditor/www/js/EditorUi.js index 6c810ebfc..6ae3bc501 100644 --- a/docs/stashed/grapheditor/www/js/EditorUi.js +++ b/docs/stashed/grapheditor/www/js/EditorUi.js @@ -521,7 +521,7 @@ EditorUi = function(editor, container, lightbox) ['strokeColor', 'strokeWidth'], ['fillColor', 'gradientColor'], valueStyles, - ['opacity'], + .opacity, ['align'], ['html']]; diff --git a/packages/html/stories/Boundary.stories.js b/packages/html/stories/Boundary.stories.js index 398d25606..2cbbd9097 100644 --- a/packages/html/stories/Boundary.stories.js +++ b/packages/html/stories/Boundary.stories.js @@ -136,7 +136,7 @@ const Template = ({ label, ...args }) => { style.fillColor = '#ffffff'; style.strokeColor = '#000000'; style.strokeWidth = '2'; - style.strokeColor = '#000000'; + style.fontColor = '#000000'; style.fontSize = '12'; style.fontStyle = 1; graph.getStylesheet().putDefaultVertexStyle(style); diff --git a/packages/html/stories/Images.stories.js b/packages/html/stories/Images.stories.js index 9bf71e40b..f591adf72 100644 --- a/packages/html/stories/Images.stories.js +++ b/packages/html/stories/Images.stories.js @@ -102,7 +102,7 @@ const Template = ({ label, ...args }) => { style.shape = mxConstants.SHAPE_IMAGE; style.perimiter = mxPerimeter.RectanglePerimeter; style.image = 'images/icons48/keys.png'; - style.strokeColor = '#FFFFFF'; + style.fontColor = '#FFFFFF'; graph.getStylesheet().putCellStyle('image', style); style = mxCloneUtils.clone(style); diff --git a/packages/html/stories/Merge.stories.js b/packages/html/stories/Merge.stories.js index bf5b474a4..fcd176d04 100644 --- a/packages/html/stories/Merge.stories.js +++ b/packages/html/stories/Merge.stories.js @@ -41,7 +41,7 @@ const Template = ({ label, ...args }) => { let style = graph.stylesheet.getDefaultVertexStyle(); style.shape = mxConstants.SHAPE_ELLIPSE; style.perimiter = mxPerimeter.EllipsePerimeter; - style.strokeColor = 'white'; + style.fontColor = 'white'; style.gradientColor = 'white'; style.fontStyle = mxConstants.FONT_BOLD; style.fontSize = 14; @@ -49,9 +49,9 @@ const Template = ({ label, ...args }) => { // Makes all edge labels gray with a white background style = graph.stylesheet.getDefaultEdgeStyle(); - style.strokeColor = 'gray'; + style.fontColor = 'gray'; style.fontStyle = mxConstants.FONT_BOLD; - style.strokeColor = 'black'; + style.fontColor = 'black'; style.strokeWidth = 2; // Enables rubberband selection diff --git a/packages/html/stories/Monitor.stories.js b/packages/html/stories/Monitor.stories.js index 6eb71d59d..816e1c0c9 100644 --- a/packages/html/stories/Monitor.stories.js +++ b/packages/html/stories/Monitor.stories.js @@ -199,7 +199,7 @@ const Template = ({ label, ...args }) => { // Creates the stylesheet for the process display let style = graph.getStylesheet().getDefaultVertexStyle(); style.fontSize = 11; - style.strokeColor = 'black'; + style.fontColor = 'black'; style.strokeColor = '#808080'; style.fillColor = 'white'; style.gradientColor = 'white'; @@ -218,7 +218,7 @@ const Template = ({ label, ...args }) => { style.shape = mxConstants.SHAPE_SWIMLANE; style.perimiter = mxPerimeter.RectanglePerimeter; style.strokeColor = '#a0a0a0'; - style.strokeColor = '#606060'; + style.fontColor = '#606060'; style.fillColor = '#E0E0DF'; style.gradientColor = 'white'; style.startSize = 30; @@ -235,7 +235,7 @@ const Template = ({ label, ...args }) => { style.shape = mxConstants.SHAPE_RHOMBUS; style.perimiter = mxPerimeter.RhombusPerimeter; style.strokeColor = '#91BCC0'; - style.strokeColor = 'gray'; + style.fontColor = 'gray'; style.fillColor = '#91BCC0'; style.gradientColor = 'white'; style.align = mxConstants.ALIGN_CENTER; @@ -246,7 +246,7 @@ const Template = ({ label, ...args }) => { style = []; style.shape = mxConstants.SHAPE_ELLIPSE; style.perimiter = mxPerimeter.EllipsePerimeter; - style.strokeColor = 'gray'; + style.fontColor = 'gray'; style.fillColor = '#A0C88F'; style.gradientColor = 'white'; style.strokeColor = '#A0C88F'; diff --git a/packages/html/stories/OrgChart.stories.js b/packages/html/stories/OrgChart.stories.js index f70c02d1d..2083626b4 100644 --- a/packages/html/stories/OrgChart.stories.js +++ b/packages/html/stories/OrgChart.stories.js @@ -95,7 +95,7 @@ const Template = ({ label, ...args }) => { style.strokeColor = '#5d65df'; style.fillColor = '#adc5ff'; - style.strokeColor = '#1d258f'; + style.fontColor = '#1d258f'; style.fontFamily = 'Verdana'; style.fontSize = '12'; style.fontStyle = '1'; diff --git a/packages/html/stories/Stylesheet.stories.js b/packages/html/stories/Stylesheet.stories.js index c126688d6..1dd532710 100644 --- a/packages/html/stories/Stylesheet.stories.js +++ b/packages/html/stories/Stylesheet.stories.js @@ -65,7 +65,7 @@ const Template = ({ label, ...args }) => { style.rounded = true; style.fillColor = '#EEEEEE'; style.gradientColor = 'white'; - style.strokeColor = '#774400'; + style.fontColor = '#774400'; style.align = mxConstants.ALIGN_CENTER; style.verticalAlign = mxConstants.ALIGN_MIDDLE; style.fontSize = '12'; diff --git a/packages/html/stories/SwimLanes.stories.js b/packages/html/stories/SwimLanes.stories.js index eaac4efba..4764b17e0 100644 --- a/packages/html/stories/SwimLanes.stories.js +++ b/packages/html/stories/SwimLanes.stories.js @@ -67,7 +67,7 @@ const Template = ({ label, ...args }) => { style.fontSize = 11; style.startSize = 22; style.horizontal = false; - style.strokeColor = 'black'; + style.fontColor = 'black'; style.strokeColor = 'black'; delete style.fillColor; @@ -108,7 +108,7 @@ const Template = ({ label, ...args }) => { style.edge = mxEdgeStyle.ElbowConnector; style.endArrow = mxConstants.ARROW_BLOCK; style.rounded = true; - style.strokeColor = 'black'; + style.fontColor = 'black'; style.strokeColor = 'black'; style = mxCloneUtils.clone(style); diff --git a/packages/html/stories/UserObject.stories.js b/packages/html/stories/UserObject.stories.js index 72174900a..e33f8f528 100644 --- a/packages/html/stories/UserObject.stories.js +++ b/packages/html/stories/UserObject.stories.js @@ -180,7 +180,7 @@ const Template = ({ label, ...args }) => { style.shadow = true; style.fillColor = '#DFDFDF'; style.gradientColor = 'white'; - style.strokeColor = 'black'; + style.fontColor = 'black'; style.fontSize = '12'; style.spacing = 4; @@ -190,7 +190,7 @@ const Template = ({ label, ...args }) => { style.labelBackgroundColor = 'white'; style.edge = mxEdgeStyle.ElbowConnector; style.rounded = true; - style.strokeColor = 'black'; + style.fontColor = 'black'; style.fontSize = '10'; // Gets the default parent for inserting new cells. This