[VarDumper] Fix HtmlDumper classes match
This commit is contained in:
parent
c2eeb2929a
commit
229430fdbd
@ -310,6 +310,9 @@ return function (root, x) {
|
|||||||
|
|
||||||
return "concat(" + parts.join(",") + ", '')";
|
return "concat(" + parts.join(",") + ", '')";
|
||||||
}
|
}
|
||||||
|
function xpathHasClass(className) {
|
||||||
|
return "contains(concat(' ', normalize-space(@class), ' '), ' " + className +" ')";
|
||||||
|
}
|
||||||
addEventListener(root, 'mouseover', function (e) {
|
addEventListener(root, 'mouseover', function (e) {
|
||||||
if ('' != refStyle.innerHTML) {
|
if ('' != refStyle.innerHTML) {
|
||||||
refStyle.innerHTML = '';
|
refStyle.innerHTML = '';
|
||||||
@ -516,7 +519,15 @@ return function (root, x) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var xpathResult = doc.evaluate('//pre[@id="' + root.id + '"]//span[@class="sf-dump-str" or @class="sf-dump-key" or @class="sf-dump-public" or @class="sf-dump-protected" or @class="sf-dump-private"][contains(translate(child::text(), ' + xpathString(searchQuery.toUpperCase()) + ', ' + xpathString(searchQuery.toLowerCase()) + '), ' + xpathString(searchQuery.toLowerCase()) + ')]', document, null, XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
|
var classMatches = [
|
||||||
|
"sf-dump-str",
|
||||||
|
"sf-dump-key",
|
||||||
|
"sf-dump-public",
|
||||||
|
"sf-dump-protected",
|
||||||
|
"sf-dump-private",
|
||||||
|
].map(xpathHasClass).join(' or ');
|
||||||
|
|
||||||
|
var xpathResult = doc.evaluate('.//span[' + classMatches + '][contains(translate(child::text(), ' + xpathString(searchQuery.toUpperCase()) + ', ' + xpathString(searchQuery.toLowerCase()) + '), ' + xpathString(searchQuery.toLowerCase()) + ')]', root, null, XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
|
||||||
|
|
||||||
while (node = xpathResult.iterateNext()) state.nodes.push(node);
|
while (node = xpathResult.iterateNext()) state.nodes.push(node);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user