mirror of
				https://github.com/node-red/node-red.git
				synced 2025-03-01 10:36:34 +00:00 
			
		
		
		
	Merge 593eb220a6 into bb01f26f06
				
					
				
			This commit is contained in:
		@@ -46,7 +46,8 @@ If you've got a bug-fix or similar for us, then you are most welcome to
 | 
				
			|||||||
get it raised - just make sure you link back to the issue it's fixing and
 | 
					get it raised - just make sure you link back to the issue it's fixing and
 | 
				
			||||||
try to include some tests!
 | 
					try to include some tests!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
All contributors need to sign the OpenJS Foundation's Contributor License Agreement.
 | 
					All contributors need to sign the OpenJS Foundation's
 | 
				
			||||||
 | 
					[Contributor License Agreement](https://openjsf.org/about/the-openjs-foundation-cla/).
 | 
				
			||||||
It is an online process and quick to do. If you raise a pull-request without
 | 
					It is an online process and quick to do. If you raise a pull-request without
 | 
				
			||||||
having signed the CLA, you will be prompted to do so automatically.
 | 
					having signed the CLA, you will be prompted to do so automatically.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -347,7 +347,6 @@ async function loadPluginConfig(fileInfo) {
 | 
				
			|||||||
function loadNodeSet(node) {
 | 
					function loadNodeSet(node) {
 | 
				
			||||||
    if (!node.enabled) {
 | 
					    if (!node.enabled) {
 | 
				
			||||||
        return Promise.resolve(node);
 | 
					        return Promise.resolve(node);
 | 
				
			||||||
    } else {
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    try {
 | 
					    try {
 | 
				
			||||||
        var loadPromise = null;
 | 
					        var loadPromise = null;
 | 
				
			||||||
@@ -377,7 +376,6 @@ function loadNodeSet(node) {
 | 
				
			|||||||
    } catch(err) {
 | 
					    } catch(err) {
 | 
				
			||||||
        node.err = err;
 | 
					        node.err = err;
 | 
				
			||||||
        var stack = err.stack;
 | 
					        var stack = err.stack;
 | 
				
			||||||
        var message;
 | 
					 | 
				
			||||||
        if (stack) {
 | 
					        if (stack) {
 | 
				
			||||||
            var filePath = node.file;
 | 
					            var filePath = node.file;
 | 
				
			||||||
            try {
 | 
					            try {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -539,25 +539,6 @@ function checkTypeInUse(id) {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function updateMissingTypes() {
 | 
					 | 
				
			||||||
    var subflowInstanceRE = /^subflow:(.+)$/;
 | 
					 | 
				
			||||||
    activeFlowConfig.missingTypes = [];
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    for (var id in activeFlowConfig.allNodes) {
 | 
					 | 
				
			||||||
        if (activeFlowConfig.allNodes.hasOwnProperty(id)) {
 | 
					 | 
				
			||||||
            var node = activeFlowConfig.allNodes[id];
 | 
					 | 
				
			||||||
            if (node.type !== 'tab' && node.type !== 'subflow') {
 | 
					 | 
				
			||||||
                var subflowDetails = subflowInstanceRE.exec(node.type);
 | 
					 | 
				
			||||||
                if ( (subflowDetails && !activeFlowConfig.subflows[subflowDetails[1]]) || (!subflowDetails && !typeRegistry.get(node.type)) ) {
 | 
					 | 
				
			||||||
                    if (activeFlowConfig.missingTypes.indexOf(node.type) === -1) {
 | 
					 | 
				
			||||||
                        activeFlowConfig.missingTypes.push(node.type);
 | 
					 | 
				
			||||||
                    }
 | 
					 | 
				
			||||||
                }
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
async function addFlow(flow, user) {
 | 
					async function addFlow(flow, user) {
 | 
				
			||||||
    var i,node;
 | 
					    var i,node;
 | 
				
			||||||
    if (!flow.hasOwnProperty('nodes')) {
 | 
					    if (!flow.hasOwnProperty('nodes')) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user