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

Fixed the problems when using a node without defaults

Browse Source
This commit is contained in:
Kazuki-Nakanishi 2018-02-22 14:10:31 +09:00
parent fdae75c99b
commit f21260370f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/js/history.js
View File

@ -191,7 +191,7 @@ RED.history = (function() {
} else if (ev.t == "edit") { } else if (ev.t == "edit") {
for (i in ev.changes) { for (i in ev.changes) {
if (ev.changes.hasOwnProperty(i)) { if (ev.changes.hasOwnProperty(i)) {
if (ev.node._def.defaults[i] && ev.node._def.defaults[i].type) { if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
// This is a config node property // This is a config node property
var currentConfigNode = RED.nodes.node(ev.node[i]); var currentConfigNode = RED.nodes.node(ev.node[i]);
if (currentConfigNode) { if (currentConfigNode) {

4
editor/js/ui/editor.js
View File

@ -742,7 +742,7 @@ RED.editor = (function() {
buildLabelRow().appendTo(outputsDiv); buildLabelRow().appendTo(outputsDiv);
} }
if (!node._def.defaults.hasOwnProperty("icon") && node.type !== "subflow") { if ((!node._def.defaults || !node._def.defaults.hasOwnProperty("icon")) && node.type !== "subflow") {
$('<div class="form-row"><div id="node-settings-icon"></div></div>').appendTo(dialogForm); $('<div class="form-row"><div id="node-settings-icon"></div></div>').appendTo(dialogForm);
var iconDiv = $("#node-settings-icon"); var iconDiv = $("#node-settings-icon");
$('<label data-i18n="editor.settingIcon">').appendTo(iconDiv); $('<label data-i18n="editor.settingIcon">').appendTo(iconDiv);
@ -1071,7 +1071,7 @@ RED.editor = (function() {
changed = true; changed = true;
} }
if (!editing_node._def.defaults.hasOwnProperty("icon")) { if (!editing_node._def.defaults || !editing_node._def.defaults.hasOwnProperty("icon")) {
var iconModule = $("#node-settings-icon-module-hidden").val(); var iconModule = $("#node-settings-icon-module-hidden").val();
var iconFile = $("#node-settings-icon-file-hidden").val(); var iconFile = $("#node-settings-icon-file-hidden").val();
var icon = (iconModule && iconFile) ? iconModule+"/"+iconFile : ""; var icon = (iconModule && iconFile) ? iconModule+"/"+iconFile : "";