diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index 7fbe27fc2..af6bfdaf0 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -105,10 +105,10 @@
var footerToolbar = $('
'+
- ''+
- ''+
- ' '+
- ''+
+ // ''+
+ // ''+
+ // ' '+
+ // ''+
' ' +
'
');
@@ -230,12 +230,6 @@
}
RED.view.redraw();
};
- $(msg).click(function() {
- var node = RED.nodes.node(o.id) || RED.nodes.node(o.z);
- if (node) {
- RED.view.reveal(node.id);
- }
- });
var name = sanitize(((o.name?o.name:o.id)||"").toString());
var topic = sanitize((o.topic||"").toString());
var property = sanitize(o.property?o.property:'');
@@ -244,10 +238,17 @@
msg.className = 'debug-message'+(o.level?(' debug-message-level-'+o.level):'') +
((sourceNode&&sourceNode.z)?((" debug-message-flow-"+sourceNode.z+((filter&&(RED.workspaces.active()!==sourceNode.z))?" hide":""))):"");
- msg.innerHTML = ''+
- getTimestamp()+''+
- (name?''+name:'')+
- '';
+ $(''+ getTimestamp()+'').appendTo(msg);
+ if (sourceNode) {
+ $('',{href:"#",class:"debug-message-name"}).html('node: '+sourceNode.id)
+ .appendTo(msg)
+ .click(function(evt) {
+ evt.preventDefault();
+ RED.view.reveal(sourceNode.id);
+ });
+ } else if (name) {
+ $(''+name+'').appendTo(msg);
+ }
// NOTE: relying on function error to have a "type" that all other msgs don't
if (o.hasOwnProperty("type") && (o.type === "function")) {
var errorLvlType = 'error';
@@ -257,13 +258,12 @@
errorLvlType = 'warn';
}
msg.className = 'debug-message debug-message-level-' + errorLvl;
- msg.innerHTML += 'function : (' + errorLvlType + ')';
+ $('function : (' + errorLvlType + ')').appendTo(msg);
} else {
- msg.innerHTML += ''+
+ $(''+
(o.topic?topic+' : ':'')+
(o.property?'msg.'+property:'msg')+" : "+format+
-
- '';
+ '').appendTo(msg);
}
if (format === 'Object' || /^array/.test(format) || format === 'boolean' || format === 'number' ) {
payload = JSON.parse(payload);
diff --git a/nodes/core/core/lib/debug/debug-utils.js b/nodes/core/core/lib/debug/debug-utils.js
index 1617cfb59..7084c88ae 100644
--- a/nodes/core/core/lib/debug/debug-utils.js
+++ b/nodes/core/core/lib/debug/debug-utils.js
@@ -19,6 +19,7 @@ RED.debug = (function() {
header.addClass("debug-message-expandable");
header.click(function(e) {
$(this).parent().toggleClass('collapsed');
+ //e.stopPropagation();
e.preventDefault();
});
}
@@ -26,8 +27,6 @@ RED.debug = (function() {
headerHead = $('').appendTo(header);
$('[ ').appendTo(headerHead);
}
-
-
for (i=0;i