Skip to content

Commit bd2b612

Browse files
committed
channel tweaks
1 parent 67fb01c commit bd2b612

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

src/js/LogDumper.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ var logDumper = (function($, module) {
462462
$container: $("#"+meta.requestId)
463463
},
464464
channels = info.$container.data('channels') || [],
465+
channel = meta.channel || info.$container.data("channelRoot"),
465466
i,
466467
$channelCheckbox,
467468
$node;
@@ -490,14 +491,12 @@ var logDumper = (function($, module) {
490491
} else {
491492
$node = methods.default(method, args, meta, info);
492493
}
493-
if (meta.channel !== undefined && channels.indexOf(meta.channel) < 0) {
494-
addChannel(meta.channel, info);
495-
}
494+
addChannel(channel, info);
496495
if ($node) {
497496
info.$currentNode.append($node);
498497
$node.attr("data-channel", meta.channel); // using attr so can use [data-channel="xxx"] selector
499-
if (channels.length > 1 && !info.$container.find('.channels input[value="'+meta.channel+'"]').prop("checked")) {
500-
$node.addClass("hidden-channel");
498+
if (channels.length > 1 && channel !== "phpError" && !info.$container.find('.channels input[value="'+channel+'"]').prop("checked")) {
499+
$node.addClass("filter-hidden");
501500
}
502501
if ($node.is(':visible')) {
503502
$node.debugEnhance();
@@ -528,16 +527,18 @@ var logDumper = (function($, module) {
528527
channels.push(channel);
529528
$container.data("channels", channels);
530529
$ul = $().debugEnhance("buildChannelList", channels, channelRoot);
531-
if ($channels.length) {
532-
$channels.find("> ul").replaceWith($ul);
533-
$channels.show();
534-
} else {
535-
$channels = $("<fieldset />", {
536-
class: "channels",
537-
})
538-
.append('<legend>Channels</legend>')
539-
.append($ul);
540-
$container.find(".panel-body").prepend($channels);
530+
if (channels.length > 1) {
531+
if ($channels.length) {
532+
$channels.find("> ul").replaceWith($ul);
533+
$channels.show();
534+
} else {
535+
$channels = $("<fieldset />", {
536+
class: "channels",
537+
})
538+
.append('<legend>Channels</legend>')
539+
.append($ul);
540+
$container.find(".panel-body").prepend($channels);
541+
}
541542
}
542543
}
543544

0 commit comments

Comments
 (0)