frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Ensure group theme picks up theme defaults properly

Browse Source 
Fixes #2651
This commit is contained in:
Nick O'Leary 2020-07-13 20:44:53 +01:00
parent 62c01b59b2
commit 98c7364924
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/node_modules/@node-red/editor-client/src/js/ui/group.js vendored
View File

@ -105,18 +105,18 @@ RED.group = (function() {
cellHeight: 16, cellHeight: 16,
cellMargin: 3, cellMargin: 3,
none: true, none: true,
opacity: style['stroke-opacity'] || 1.0 opacity: style.hasOwnProperty('stroke-opacity')?style['stroke-opacity']:(defaultGroupStyle.hasOwnProperty('stroke-opacity')?defaultGroupStyle['stroke-opacity']:1.0)
}).appendTo("#node-input-row-style-stroke"); }).appendTo("#node-input-row-style-stroke");
RED.colorPicker.create({ RED.colorPicker.create({
id:"node-input-style-fill", id:"node-input-style-fill",
value: style.fill || "none", value: style.fill || defaultGroupStyle.fill ||"none",
palette: colorPalette, palette: colorPalette,
cellPerRow: colorCount, cellPerRow: colorCount,
cellWidth: 16, cellWidth: 16,
cellHeight: 16, cellHeight: 16,
cellMargin: 3, cellMargin: 3,
none: true, none: true,
opacity: style['fill-opacity'] || 1.0 opacity: style.hasOwnProperty('fill-opacity')?style['fill-opacity']:(defaultGroupStyle.hasOwnProperty('fill-opacity')?defaultGroupStyle['fill-opacity']:1.0)
}).appendTo("#node-input-row-style-fill"); }).appendTo("#node-input-row-style-fill");
createLayoutPicker({ createLayoutPicker({
@ -162,12 +162,6 @@ RED.group = (function() {
delete this.style.color; delete this.style.color;
} }
if (this.style["stroke-opacity"] === "1") {
delete this.style["stroke-opacity"]
}
if (this.style["fill-opacity"] === "1") {
delete this.style["fill-opacity"]
}
var node = this; var node = this;
['stroke','fill','stroke-opacity','fill-opacity','color','label-position'].forEach(function(prop) { ['stroke','fill','stroke-opacity','fill-opacity','color','label-position'].forEach(function(prop) {
if (node.style[prop] === defaultGroupStyle[prop]) { if (node.style[prop] === defaultGroupStyle[prop]) {