diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa991ac3..b488492b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,18 @@ Projects - Avoid unnecessary project refresh on branch-switch Fixes #1597 - Add support for file:// git urls - Handle project first-run without existing flow file + - Handle delete of last remote in project settings + - Add git_pull_unrelated_history handling + - Fix pull/push when no tracked branch + - Remember to disable projects in editor when git not found Node Fixes - Trigger node migration - ensure bytopic not blank - Add HEAD to list of methods with no body in http req node #1598 - Do not include payload in GET requests Fixes #1598 + - Update sort/batch docs Fixes #1601 + - Don't assume node has defaults when exporting icon property #### 0.18: Milestone Release diff --git a/editor/js/nodes.js b/editor/js/nodes.js index cdd1dfae7..b3c39fff1 100644 --- a/editor/js/nodes.js +++ b/editor/js/nodes.js @@ -501,7 +501,7 @@ RED.nodes = (function() { if (n.outputs > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) { node.outputLabels = n.outputLabels.slice(); } - if (!n._def.defaults.hasOwnProperty("icon") && n.icon) { + if ((!n._def.defaults || !n._def.defaults.hasOwnProperty("icon")) && n.icon) { var defIcon = RED.utils.getDefaultNodeIcon(n._def, n); if (n.icon !== defIcon.module+"/"+defIcon.file) { node.icon = n.icon; diff --git a/nodes/core/logic/18-sort.html b/nodes/core/logic/18-sort.html index af66bef84..926d7e308 100644 --- a/nodes/core/logic/18-sort.html +++ b/nodes/core/logic/18-sort.html @@ -14,8 +14,6 @@ limitations under the License. --> - -