Skip to content

Commit 1a15156

Browse files
committed
nested channels ignoring their output config value. restore non-sidebar channel filter/toggles functionality (used by documentation)
1 parent c9eb7b5 commit 1a15156

4 files changed

Lines changed: 11 additions & 2 deletions

File tree

src/Debug/Internal.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ public function publishOutputEvent()
9898
}
9999
$channels[] = $debug;
100100
foreach ($channels as $channel) {
101+
if ($channel->getCfg('output', Debug::CONFIG_DEBUG) === false) {
102+
continue;
103+
}
101104
$event = $channel->eventManager->publish(
102105
Debug::EVENT_OUTPUT,
103106
$channel,

src/Debug/js/Debug.jquery.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1079,11 +1079,14 @@
10791079
];
10801080

10811081
function init$4 ($delegateNode) {
1082-
var $debugTabLog = $delegateNode.find('> .tab-panes > .tab-primary');
1082+
/*
1083+
var $debugTabLog = $delegateNode.find('> .tab-panes > .tab-primary')
10831084
if ($debugTabLog.length > 0 && $debugTabLog.data('options').sidebar === false) {
10841085
// no sidebar -> no filtering
1086+
// documentation uses non-sidebar filtering
10851087
return
10861088
}
1089+
*/
10871090
applyFilter($delegateNode);
10881091
$delegateNode.on('change', 'input[type=checkbox]', onCheckboxChange);
10891092
$delegateNode.on('change', 'input[data-toggle=error]', onToggleErrorChange);

src/Debug/js/Debug.jquery.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Debug/js_src/filter.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ var preFilterCallbacks = [
2626
]
2727

2828
export function init ($delegateNode) {
29+
/*
2930
var $debugTabLog = $delegateNode.find('> .tab-panes > .tab-primary')
3031
if ($debugTabLog.length > 0 && $debugTabLog.data('options').sidebar === false) {
3132
// no sidebar -> no filtering
33+
// documentation uses non-sidebar filtering
3234
return
3335
}
36+
*/
3437
applyFilter($delegateNode)
3538
$delegateNode.on('change', 'input[type=checkbox]', onCheckboxChange)
3639
$delegateNode.on('change', 'input[data-toggle=error]', onToggleErrorChange)

0 commit comments

Comments
 (0)