From db65460ec00c649bfe12576a033b00578c07ff4a Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 31 Jul 2019 22:59:29 +0900
Subject: [PATCH] fix SUBFLOW palette node update & SUBFLOW default color

---
 .../@node-red/editor-client/src/js/ui/editor.js    |  3 +--
 .../@node-red/editor-client/src/js/ui/palette.js   | 14 +++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 026fd76ac..2e3412e9b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1117,7 +1117,7 @@ RED.editor = (function() {
 
         if (node.type === "subflow") {
             // subflow template can select its color
-            var color = node.color ? node.color : "#E9967A";
+            var color = node.color ? node.color : "#da9";
             var colorRow = $("<div/>", {
                 class: "form-row"
             }).appendTo(dialogForm);
@@ -2309,7 +2309,6 @@ RED.editor = (function() {
                             changes.color = newColor;
                             changed = true;
                             RED.utils.clearNodeColorCache();
-                            RED.palette.changeSubflowColor(editing_node, newColor);
                         }
 
                         var old_env = editing_node.env;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index 7eaa914b7..ae78b2e1d 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -429,10 +429,9 @@ RED.palette = (function() {
                         currentCategoryNode.find("i").toggleClass("expanded");
                     }
                 }
-
-
-
             }
+
+            paletteNode.css("backgroundColor", sf.color);
         });
     }
 
@@ -593,12 +592,6 @@ RED.palette = (function() {
         setTimeout(function() { $(window).trigger("resize"); } ,200);
     }
 
-    function changeSubflowColor(sf, color) {
-        var paletteNode = getPaletteNode('subflow:'+sf.id);
-        paletteNode.css("backgroundColor", color);
-    }
-
-
     function getCategories() {
         var categories = [];
         $("#red-ui-palette-container .red-ui-palette-category").each(function(i,d) {
@@ -613,7 +606,6 @@ RED.palette = (function() {
         hide:hideNodeType,
         show:showNodeType,
         refresh:refreshNodeTypes,
-        getCategories: getCategories,
-        changeSubflowColor: changeSubflowColor
+        getCategories: getCategories
     };
 })();