bug #23983 [VarDumper] Strengthen dumped JS (nicolas-grekas)
This PR was merged into the 3.3 branch.
Discussion
----------
[VarDumper] Strengthen dumped JS
| Q | A
| ------------- | ---
| Branch? | 3.3
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
3.3 part of #23982
Commits
-------
5e05fc958f
[VarDumper] Strengthen dumped JS
This commit is contained in:
commit
ebd14ee67f
@ -187,7 +187,7 @@ function toggle(a, recursive) {
|
|||||||
function collapse(a, recursive) {
|
function collapse(a, recursive) {
|
||||||
var s = a.nextSibling || {}, oldClass = s.className;
|
var s = a.nextSibling || {}, oldClass = s.className;
|
||||||
|
|
||||||
if ('sf-dump-expanded' == oldClass) {
|
if (/\bsf-dump-expanded\b/.test(oldClass)) {
|
||||||
toggle(a, recursive);
|
toggle(a, recursive);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -199,7 +199,7 @@ function collapse(a, recursive) {
|
|||||||
function expand(a, recursive) {
|
function expand(a, recursive) {
|
||||||
var s = a.nextSibling || {}, oldClass = s.className;
|
var s = a.nextSibling || {}, oldClass = s.className;
|
||||||
|
|
||||||
if ('sf-dump-compact' == oldClass) {
|
if (/\bsf-dump-compact\b/.test(oldClass)) {
|
||||||
toggle(a, recursive);
|
toggle(a, recursive);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -254,8 +254,8 @@ function highlight(root, activeNode, nodes) {
|
|||||||
|
|
||||||
function resetHighlightedNodes(root) {
|
function resetHighlightedNodes(root) {
|
||||||
Array.from(root.querySelectorAll('.sf-dump-str, .sf-dump-key, .sf-dump-public, .sf-dump-protected, .sf-dump-private')).forEach(function (strNode) {
|
Array.from(root.querySelectorAll('.sf-dump-str, .sf-dump-key, .sf-dump-public, .sf-dump-protected, .sf-dump-private')).forEach(function (strNode) {
|
||||||
strNode.className = strNode.className.replace(/\b sf-dump-highlight\b/, '');
|
strNode.className = strNode.className.replace(/\bsf-dump-highlight\b/, '');
|
||||||
strNode.className = strNode.className.replace(/\b sf-dump-highlight-active\b/, '');
|
strNode.className = strNode.className.replace(/\bsf-dump-highlight-active\b/, '');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -352,7 +352,7 @@ return function (root, x) {
|
|||||||
} else if (/\bsf-dump-str-toggle\b/.test(a.className)) {
|
} else if (/\bsf-dump-str-toggle\b/.test(a.className)) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e = a.parentNode.parentNode;
|
e = a.parentNode.parentNode;
|
||||||
e.className = e.className.replace(/sf-dump-str-(expand|collapse)/, a.parentNode.className);
|
e.className = e.className.replace(/\bsf-dump-str-(expand|collapse)\b/, a.parentNode.className);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -518,8 +518,7 @@ return function (root, x) {
|
|||||||
Array.from(search.querySelectorAll('.sf-dump-search-input-next, .sf-dump-search-input-previous')).forEach(function (btn) {
|
Array.from(search.querySelectorAll('.sf-dump-search-input-next, .sf-dump-search-input-previous')).forEach(function (btn) {
|
||||||
addEventListener(btn, 'click', function (e) {
|
addEventListener(btn, 'click', function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
var direction = -1 !== e.target.className.indexOf('next') ? 'next' : 'previous';
|
-1 !== e.target.className.indexOf('next') ? state.next() : state.previous();
|
||||||
'next' === direction ? state.next() : state.previous();
|
|
||||||
searchInput.focus();
|
searchInput.focus();
|
||||||
collapseAll(root);
|
collapseAll(root);
|
||||||
showCurrent(state);
|
showCurrent(state);
|
||||||
|
Reference in New Issue
Block a user