From 8b0e76dd5582d8b7baebae19311982e07d66b7ca Mon Sep 17 00:00:00 2001
From: Kazuki-Nakanishi <kazuki.nakanishi.vr@hitachi-solutions.com>
Date: Thu, 22 Mar 2018 14:14:09 +0900
Subject: [PATCH] Hide the subflow check logic inside getDefaultNodeIcon
 function

---
 editor/js/ui/editor.js | 7 +------
 editor/js/ui/utils.js  | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index c90d3729b..f0dcef8da 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -787,12 +787,7 @@ RED.editor = (function() {
             var clear = $('<button class="editor-button editor-button-small"><i class="fa fa-times"></i></button>').appendTo(iconForm);
             clear.click(function(evt) {
                 evt.preventDefault();
-                var iconPath;
-                if (node.type === "subflow") {
-                    iconPath = { module:"node-red", file:"subflow.png" };
-                } else {
-                    iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
-                }
+                var iconPath = RED.utils.getDefaultNodeIcon(node._def, node);
                 selectIconModule.val(iconPath.module);
                 moduleChange(selectIconModule, selectIconFile, iconModuleHidden, iconFileHidden, iconSets, true);
                 selectIconFile.removeClass("input-error");
diff --git a/editor/js/ui/utils.js b/editor/js/ui/utils.js
index 989365655..9dd4d8ac2 100644
--- a/editor/js/ui/utils.js
+++ b/editor/js/ui/utils.js
@@ -708,7 +708,9 @@ RED.utils = (function() {
 
     function getDefaultNodeIcon(def,node) {
         var icon_url;
-        if (typeof def.icon === "function") {
+        if (node && node.type === "subflow") {
+            icon_url = "node-red/subflow.png";
+        } else if (typeof def.icon === "function") {
             try {
                 icon_url = def.icon.call(node);
             } catch(err) {
@@ -753,8 +755,6 @@ RED.utils = (function() {
             if (isIconExists(iconPath)) {
                 return "icons/" + node.icon;
             }
-        } else if (node && node.type === 'subflow') {
-            return "icons/node-red/subflow.png"
         }
 
         var iconPath = getDefaultNodeIcon(def, node);