mirror of
				https://github.com/node-red/node-red.git
				synced 2025-03-01 10:36:34 +00:00 
			
		
		
		
	Merge branch 'master' into 4133-mqtt-v5-disconnects-when-subscribing-to-aws-core-broker
This commit is contained in:
		| @@ -491,6 +491,7 @@ | ||||
|         "unassigned": "未割当", | ||||
|         "global": "グローバル", | ||||
|         "workspace": "ワークスペース", | ||||
|         "editor": "編集ダイアログ", | ||||
|         "selectAll": "全てのノードを選択", | ||||
|         "selectNone": "選択を外す", | ||||
|         "selectAllConnected": "接続されたノードを選択", | ||||
|   | ||||
| @@ -37,13 +37,13 @@ RED.clipboard = (function() { | ||||
|             // IE11 workaround | ||||
|             // IE does not support data uri scheme for downloading data | ||||
|             var blob = new Blob([data], { | ||||
|                 type: "data:text/plain;charset=utf-8" | ||||
|                 type: "data:application/json;charset=utf-8" | ||||
|             }); | ||||
|             navigator.msSaveBlob(blob, file); | ||||
|         } | ||||
|         else { | ||||
|             var element = document.createElement('a'); | ||||
|             element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(data)); | ||||
|             element.setAttribute('href', 'data:application/json;charset=utf-8,' + encodeURIComponent(data)); | ||||
|             element.setAttribute('download', file); | ||||
|             element.style.display = 'none'; | ||||
|             document.body.appendChild(element); | ||||
|   | ||||
| @@ -2646,6 +2646,16 @@ RED.view = (function() { | ||||
|                         var result = RED.nodes.removeJunction(node) | ||||
|                         removedJunctions.push(node); | ||||
|                         removedLinks = removedLinks.concat(result.links); | ||||
|                         if (node.g) { | ||||
|                             var group = RED.nodes.group(node.g); | ||||
|                             if (selectedGroups.indexOf(group) === -1) { | ||||
|                                 // Don't use RED.group.removeFromGroup as that emits | ||||
|                                 // a change event on the node - but we're deleting it | ||||
|                                 var index = group.nodes.indexOf(node); | ||||
|                                 group.nodes.splice(index,1); | ||||
|                                 RED.group.markDirty(group); | ||||
|                             } | ||||
|                         } | ||||
|                     } else { | ||||
|                         if (node.direction === "out") { | ||||
|                             removedSubflowOutputs.push(node); | ||||
|   | ||||
| @@ -35,7 +35,11 @@ module.exports = function(RED) { | ||||
|                 } | ||||
|                 else { node.previous = {}; } | ||||
|             } | ||||
|             var value = RED.util.getMessageProperty(msg,node.property); | ||||
|             var value; | ||||
|             try { | ||||
|                 value = RED.util.getMessageProperty(msg,node.property); | ||||
|             } | ||||
|             catch(e) { } | ||||
|             if (value !== undefined) { | ||||
|                 var t = "_no_topic"; | ||||
|                 if (node.septopics) { t = topic || t; } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user