mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Clear debug message when switching projects (#1523)
* Clear debug sidebar when switching project * Delete a unnecessary comment * Clear any filters the users has enabled * Clear filter settings only when the user opens a project
This commit is contained in:
parent
5a6cde1446
commit
207d3d3340
@ -910,7 +910,9 @@ RED.projects = (function() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},projectData).always(function() {
|
},projectData).then(function() {
|
||||||
|
RED.events.emit("project:change", {name:name});
|
||||||
|
}).always(function() {
|
||||||
RED.deploy.setDeployInflight(false);
|
RED.deploy.setDeployInflight(false);
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -1075,7 +1077,9 @@ RED.projects = (function() {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},{active:true}).always(function() {
|
},{active:true}).then(function() {
|
||||||
|
RED.events.emit("project:change", {name:name});
|
||||||
|
}).always(function() {
|
||||||
RED.deploy.setDeployInflight(false);
|
RED.deploy.setDeployInflight(false);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -183,6 +183,18 @@
|
|||||||
};
|
};
|
||||||
RED.comms.subscribe("debug",this.handleDebugMessage);
|
RED.comms.subscribe("debug",this.handleDebugMessage);
|
||||||
|
|
||||||
|
this.clearMessageList = function() {
|
||||||
|
RED.debug.clearMessageList(true);
|
||||||
|
if (subWindow) {
|
||||||
|
try {
|
||||||
|
subWindow.postMessage({event:"projectChange"},"*");
|
||||||
|
} catch(err) {
|
||||||
|
console.log(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
RED.events.on("project:change", this.clearMessageList);
|
||||||
|
|
||||||
$("#debug-tab-open").click(function(e) {
|
$("#debug-tab-open").click(function(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
subWindow = window.open(document.location.toString().replace(/[?#].*$/,"")+"debug/view/view.html"+document.location.search,"nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
|
subWindow = window.open(document.location.toString().replace(/[?#].*$/,"")+"debug/view/view.html"+document.location.search,"nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
|
||||||
|
@ -68,7 +68,7 @@ RED.debug = (function() {
|
|||||||
// var filterTypeRow = $('<div class="debug-filter-row"></div>').appendTo(filterDialog);
|
// var filterTypeRow = $('<div class="debug-filter-row"></div>').appendTo(filterDialog);
|
||||||
// $('<select><option>Show all debug nodes</option><option>Show selected debug nodes</option><option>Show current flow only</option></select>').appendTo(filterTypeRow);
|
// $('<select><option>Show all debug nodes</option><option>Show selected debug nodes</option><option>Show current flow only</option></select>').appendTo(filterTypeRow);
|
||||||
|
|
||||||
var debugNodeListRow = $('<div class="debug-filter-row hide"></div>').appendTo(filterDialog);
|
var debugNodeListRow = $('<div class="debug-filter-row hide" id="debug-filter-node-list-row"></div>').appendTo(filterDialog);
|
||||||
var flowCheckboxes = {};
|
var flowCheckboxes = {};
|
||||||
var debugNodeListHeader = $('<div><span data-i18n="node-red:debug.sidebar.debugNodes"></span><span></span></div>');
|
var debugNodeListHeader = $('<div><span data-i18n="node-red:debug.sidebar.debugNodes"></span><span></span></div>');
|
||||||
var headerCheckbox = $('<input type="checkbox">').appendTo(debugNodeListHeader.find("span")[1]).checkboxSet();
|
var headerCheckbox = $('<input type="checkbox">').appendTo(debugNodeListHeader.find("span")[1]).checkboxSet();
|
||||||
@ -218,9 +218,7 @@ RED.debug = (function() {
|
|||||||
|
|
||||||
toolbar.find("#debug-tab-clear").click(function(e) {
|
toolbar.find("#debug-tab-clear").click(function(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
$(".debug-message").remove();
|
clearMessageList(false);
|
||||||
messageCount = 0;
|
|
||||||
config.clear();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@ -508,10 +506,28 @@ RED.debug = (function() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function clearMessageList(clearFilter) {
|
||||||
|
$(".debug-message").remove();
|
||||||
|
config.clear();
|
||||||
|
if (!!clearFilter) {
|
||||||
|
clearFilterSettings();
|
||||||
|
}
|
||||||
|
refreshDebugNodeList();
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearFilterSettings() {
|
||||||
|
filteredNodes = {};
|
||||||
|
filterType = 'filterAll';
|
||||||
|
$('.debug-tab-filter-option').removeClass('selected');
|
||||||
|
$('#debug-tab-filterAll').addClass('selected');
|
||||||
|
$('#debug-tab-filter span').text(RED._('node-red:debug.sidebar.filterAll'));
|
||||||
|
$('#debug-filter-node-list-row').slideUp();
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
init: init,
|
init: init,
|
||||||
refreshMessageList:refreshMessageList,
|
refreshMessageList:refreshMessageList,
|
||||||
handleDebugMessage: handleDebugMessage,
|
handleDebugMessage: handleDebugMessage,
|
||||||
|
clearMessageList: clearMessageList,
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
@ -24,6 +24,8 @@ $(function() {
|
|||||||
RED.debug.handleDebugMessage(evt.data.msg);
|
RED.debug.handleDebugMessage(evt.data.msg);
|
||||||
} else if (evt.data.event === "workspaceChange") {
|
} else if (evt.data.event === "workspaceChange") {
|
||||||
RED.debug.refreshMessageList(evt.data.activeWorkspace);
|
RED.debug.refreshMessageList(evt.data.activeWorkspace);
|
||||||
|
} else if (evt.data.event === "projectChange") {
|
||||||
|
RED.debug.clearMessageList(true);
|
||||||
}
|
}
|
||||||
},false);
|
},false);
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user