17126 2008-01-31 17:06:57 -0800 Web Inspector: selectors in the Styles pane should trigger a search for that selector when clicked 2016-07-01 13:35:09 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Enhancement --- 1 aroben webkit-unassigned bburg chrisjshull graouts joepeck nvasilyev timothy webkit-bug-importer oldest_to_newest 68986 0 aroben 2008-01-31 17:06:57 -0800 Now that we've fixed bug 16234 we should linkify selectors in the Styles pane so that when you click them the selector is placed in the Inspector's search field and a search is performed. This will make it easy to see all the nodes that match a particular selector and therefore have those styles applied. 68990 1 aroben 2008-01-31 17:12:22 -0800 <rdar://problem/5718859> 156408 2 41549 joepeck 2009-10-20 23:08:37 -0700 Created attachment 41549 [PATCH] Perform Search when Single Clicking a Selector This turns out to be really awesome! Great job whoever implemented searching! 156409 3 joepeck 2009-10-20 23:13:15 -0700 Video Showing What this feels like: (although my commentary is horrible!) http://screencast.com/t/rFBUL7vy2d 156414 4 41550 joepeck 2009-10-20 23:25:50 -0700 Created attachment 41550 [PATCH] Perform Search when Single Clicking a Selector Piggy backing a little fix for editing attributes at the same time. 156470 5 joepeck 2009-10-21 06:45:54 -0700 Landed in http://trac.webkit.org/changeset/49904 r49904 = 0b3e4bd8da685736976258b07c4234273878c9f9 156480 6 pfeldman 2009-10-21 07:20:26 -0700 A small follow-up comment. As of today, search is implemented somewhat inefficient. It is going to search through the entire document and push the results into the frontend, no matter whether nodes are reached there or not. So it'll be slow for large documents. We can optimize it either in general case (for search to respond with ids of found elements and asynchronously query for the next ones), or for this case only where we make search return results the nodes that are already in frontend (i.e. superset of the visible ones). One usability nit: there is no notion of the current search result and hence using the search field and highlight is a bit confusing. I am also not a fan of the approach where selecting a non-selectable element is populating the search field and is not cleaning it up on losing selection. Due to the reasons above, Eclipse has a feature called "Mark occurrences". It is a toggle toolbar button that enables a mode where whatever you touch (move cursor to) is searched over the document and is being highlighted. When you move caret to another location it'll wait a bit and select occurrences of the new thing. 156495 7 joepeck 2009-10-21 08:38:30 -0700 (In reply to comment #6) > One usability nit: there is no notion of the current search result and hence > using the search field and highlight is a bit confusing. This is true. Maybe add some kind of pointer like how the Scripts Debugger indicates the current statement. Or adding a style class. On problem I had is if the current node is selected and highlighted. This is easily solvable with CSS. A quick example: http://grab.by/b0A :focus .outline-disclosure li.selected.highlighted .selection { background-color: rgb(255, 153, 0); } > I am also not a fan of > the approach where selecting a non-selectable element is populating the search > field and is not cleaning it up on losing selection. I don't follow this."Selecting a non-selectable element"? I could see how not cleaning up the search field could be annoying. > Due to the reasons above, Eclipse has a feature called "Mark occurrences". It > is a toggle toolbar button that enables a mode where whatever you touch (move > cursor to) is searched over the document and is being highlighted. When you > move caret to another location it'll wait a bit and select occurrences of the > new thing. This sounds good to me. Hover over (instead of clicking) a selector to highlight the nodes it affects. Also, its worth noting that WebInspector.panels.elements.performSearch(selector) works without populating the search field, but it doesn't show the # of results found. We could probably clean all of this up when improving searching like Pavel mentioned in his comment. 157383 8 joepeck 2009-10-23 17:20:00 -0700 > > Due to the reasons above, Eclipse has a feature called "Mark occurrences". It > > is a toggle toolbar button that enables a mode where whatever you touch (move > > cursor to) is searched over the document and is being highlighted. When you > > move caret to another location it'll wait a bit and select occurrences of the > > new thing. > > This sounds good to me. Hover over (instead of clicking) a selector to > highlight the nodes it affects. Also, its worth noting that > WebInspector.panels.elements.performSearch(selector) works without populating > the search field, but it doesn't show the # of results found. We could > probably clean all of this up when improving searching like Pavel mentioned in > his comment. Here is the experiment: http://screencast.com/t/JeuRXu2UaBb Improvements: - Perform a search only on selectors, not a full text search. This means that you only get the Nodes that the selector affects, not the full-text-search that searching "a" or "p" would do. Usability issues: - What if the user already has a search performed? I am attempting to stash their search and restore their search state when I would normally clear. 157397 9 joepeck 2009-10-23 18:03:28 -0700 Comments from pfeldman in IRC: - it is more than discoverable, that is a bit annoying. - what is the user story for this feature? - it is rarely required to navigate from selector to a node, this should be a popup menu-level feature... you need it rarely. - if only you highlighted them in the inspected page, i would buy it. highlighting in inspector is not useful. i mean i will see it in the mess of other tags, so what... whereas on the page it makes perfect sense - ideally, i would like it to highlight in yellow and dim as the navigation to resource does with the line. that way it will not have the "marked" state and will be ideal! - while editing style, we could keep the highlight until change is committed I am not sold that it is not useful in the inspector. I agree it would be useful to highlight them on the inspected page (would require adding support for highlighting multiple nodes in inspector clients). 157412 10 timothy 2009-10-23 19:59:12 -0700 The use case I see for it is to know what other elements you mgith be affectign with this style rule. So if you edit, you know what other things you are affecting. A pop-up menu item seems fine, it would be the first one on style rules. Maybe we don't inject the selector in the search field if it clears when you move the mouse out. Just do the search behind the scenes and highlight the nodes in the tree (and/or page). If they had a search this would temporality replace the highlighted nodes until the mouse left, then it would restore. 163163 11 41550 abarth 2009-11-12 18:51:24 -0800 Comment on attachment 41550 [PATCH] Perform Search when Single Clicking a Selector joepeck is a committer. 163186 12 41550 joepeck 2009-11-12 19:37:53 -0800 Comment on attachment 41550 [PATCH] Perform Search when Single Clicking a Selector clearing flags on already committed patch. 972295 13 bburg 2014-01-26 18:40:51 -0800 The UI for this feature needs to be rethought. 1063996 14 timothy 2015-01-25 07:59:10 -0800 We could show a magnifying glass next to the selector that triggers it. 1203353 15 nvasilyev 2016-06-17 11:31:16 -0700 A year ago, we started to highlight DOM nodes on the web page when hovering on selectors. Bug 145658: Web Inspector: Hovering over CSS selectors in Styles panel show highlight matching elements on the web page In addition to that, perhaps we should highlight DOM tree outline nodes when hovering over selectors. 1207240 16 timothy 2016-07-01 13:35:09 -0700 Nikita is right. I think we can close this at this point. 41549 2009-10-20 23:08:37 -0700 2009-10-20 23:25:50 -0700 [PATCH] Perform Search when Single Clicking a Selector search.patch text/plain 3134 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTZlZDllNy4uNmM2OTY5NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0xMC0yMCAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNlbGVjdG9ycyBpbiB0aGUgU3R5bGVz IHBhbmUgc2hvdWxkIHRyaWdnZXIgYSBzZWFyY2ggZm9yIHRoYXQgc2VsZWN0b3Igd2hlbiBjbGlj a2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzEy NgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLmFkZE5vZGVzVG9TZWFy Y2hSZXN1bHQpOiBvbmx5IGNoYW5nZSBmb2N1c2VkRE9NTm9kZSBvbiBhIG1hbnVhbCBzZWFyY2gK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLl9jbGlj a1NlbGVjdG9yKTogdHJpZ2dlciBhIHNlYXJjaAorCiAyMDA5LTEwLTIwICBab2x0YW4gSG9ydmF0 aCAgPHpvbHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcwppbmRleCA1 ZDBlNmQ3Li5hYTYzMTljIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVu dHNQYW5lbC5qcwpAQCAtMjY4LDcgKzI2OCwxMiBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5l bC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIGlmICghdGhpcy5fc2VhcmNoUmVzdWx0cy5s ZW5ndGgpIHsKICAgICAgICAgICAgICAgICB0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXgg PSAwOwotICAgICAgICAgICAgICAgIHRoaXMuZm9jdXNlZERPTU5vZGUgPSBub2RlOworCisgICAg ICAgICAgICAgICAgLy8gT25seSBjaGFuZ2UgdGhlIGZvY3VzZWRET01Ob2RlIGlmIHRoZSBzZWFy Y2ggd2FzIG1hbnVhbGx5IHBlcmZvcm1lZCwgYmVjYXVzZQorICAgICAgICAgICAgICAgIC8vIHRo ZSBzZWFyY2ggbWF5IGhhdmUgYmVlbiBwZXJmb3JtZWQgcHJvZ3JhbW1hdGljYWxseSBhbmQgd2Ug d291bGRuJ3Qgd2FudCB0bworICAgICAgICAgICAgICAgIC8vIGNoYW5nZSB0aGUgY3VycmVudCBm b2N1c2VkRE9NTm9kZS4KKyAgICAgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmN1cnJlbnRG b2N1c0VsZW1lbnQgPT09IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2giKSkKKyAgICAg ICAgICAgICAgICAgICAgdGhpcy5mb2N1c2VkRE9NTm9kZSA9IG5vZGU7CiAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIHRoaXMuX3NlYXJjaFJlc3VsdHMucHVzaChub2RlKTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCAzNTgy Zjk2Li5hOTVkYWUzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5 bGVzU2lkZWJhclBhbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxl c1NpZGViYXJQYW5lLmpzCkBAIC0zNzYsNyArMzc2LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJv cGVydGllc1NlY3Rpb24gPSBmdW5jdGlvbihzdHlsZVJ1bGUsIHN1YnRpdGxlLCBjb21wdXRlZFN0 eWwKIHsKICAgICBXZWJJbnNwZWN0b3IuUHJvcGVydGllc1NlY3Rpb24uY2FsbCh0aGlzLCBzdHls ZVJ1bGUuc2VsZWN0b3JUZXh0KTsKIAotICAgIHRoaXMudGl0bGVFbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImNsaWNrIiwgZnVuY3Rpb24oZSkgeyBlLnN0b3BQcm9wYWdhdGlvbigpOyB9LCBmYWxz ZSk7CisgICAgdGhpcy50aXRsZUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlz Ll9jbGlja1NlbGVjdG9yLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICB0aGlzLnRpdGxlRWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX2RibGNsaWNrU2VsZWN0b3IuYmlu ZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkYmxj bGljayIsIHRoaXMuX2RibGNsaWNrRW1wdHlTcGFjZS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKQEAg LTU5MSw2ICs1OTEsMTkgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJv dG90eXBlID0gewogICAgICAgICByZXR1cm4gaXRlbTsKICAgICB9LAogCisgICAgX2NsaWNrU2Vs ZWN0b3I6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0 aW9uKCk7CisKKyAgICAgICAgLy8gRG9uJ3Qgc2VhcmNoICJDb21wdXRlZCBTdHlsZXMiLCAiU3R5 bGUgQXR0cmlidXRlIiwgb3IgTWFwcGVkIEF0dHJpYnV0ZXMuCisgICAgICAgIGlmICh0aGlzLmNv bXB1dGVkU3R5bGUgfHwgIXRoaXMucnVsZSB8fCB0aGlzLnJ1bGUuaXNVc2VyKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIHZhciBzZWFyY2hFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInNlYXJjaCIpOworICAgICAgICBzZWFyY2hFbGVtZW50LnZhbHVlID0gdGhpcy5z dHlsZVJ1bGUuc2VsZWN0b3JUZXh0OworICAgICAgICBXZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJj aCh7IHRhcmdldDogc2VhcmNoRWxlbWVudCB9KTsKKyAgICB9LAorCiAgICAgX2RibGNsaWNrRW1w dHlTcGFjZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLmV4cGFuZCgpOwo= 41550 2009-10-20 23:25:50 -0700 2010-06-10 19:36:41 -0700 [PATCH] Perform Search when Single Clicking a Selector search.patch text/plain 4141 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTZlZDllNy4uMTg1YjIzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMC0yMCAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVja0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkg SGF0Y2hlci4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBTZWxlY3RvcnMgaW4gdGhlIFN0eWxl cyBwYW5lIHNob3VsZCB0cmlnZ2VyIGEgc2VhcmNoIGZvciB0aGF0IHNlbGVjdG9yIHdoZW4gY2xp Y2tlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcx MjYKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZS5hZGROb2Rlc1RvU2Vh cmNoUmVzdWx0KTogb25seSBjaGFuZ2UgZm9jdXNlZERPTU5vZGUgb24gYSBtYW51YWwgc2VhcmNo CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5fY2xp Y2tTZWxlY3Rvcik6IHRyaWdnZXIgYSBzZWFyY2gKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVu dHNUcmVlRWxlbWVudC5wcm90b3R5cGUuX3N0YXJ0RWRpdGluZyk6IGNvcnJlY3RseSBzdGFydCBl ZGl0aW5nIGF0dHJpYnV0ZSB2YWx1ZSBpbnN0ZWFkIG9mIG5hbWUKKwogMjAwOS0xMC0yMCAgWm9s dGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVt ZW50c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwu anMKaW5kZXggNWQwZTZkNy4uYWE2MzE5YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzUGFuZWwuanMKQEAgLTI2OCw3ICsyNjgsMTIgQEAgV2ViSW5zcGVjdG9yLkVs ZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICBpZiAoIXRoaXMuX3NlYXJj aFJlc3VsdHMubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFJl c3VsdEluZGV4ID0gMDsKLSAgICAgICAgICAgICAgICB0aGlzLmZvY3VzZWRET01Ob2RlID0gbm9k ZTsKKworICAgICAgICAgICAgICAgIC8vIE9ubHkgY2hhbmdlIHRoZSBmb2N1c2VkRE9NTm9kZSBp ZiB0aGUgc2VhcmNoIHdhcyBtYW51YWxseSBwZXJmb3JtZWQsIGJlY2F1c2UKKyAgICAgICAgICAg ICAgICAvLyB0aGUgc2VhcmNoIG1heSBoYXZlIGJlZW4gcGVyZm9ybWVkIHByb2dyYW1tYXRpY2Fs bHkgYW5kIHdlIHdvdWxkbid0IHdhbnQgdG8KKyAgICAgICAgICAgICAgICAvLyBjaGFuZ2UgdGhl IGN1cnJlbnQgZm9jdXNlZERPTU5vZGUuCisgICAgICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5jdXJyZW50Rm9jdXNFbGVtZW50ID09PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VhcmNo IikpCisgICAgICAgICAgICAgICAgICAgIHRoaXMuZm9jdXNlZERPTU5vZGUgPSBub2RlOwogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICB0aGlzLl9zZWFyY2hSZXN1bHRzLnB1c2gobm9kZSk7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0 bGluZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5l LmpzCmluZGV4IGM0YmQzNzIuLjZlN2UwODggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCkBAIC01NzgsNyArNTc4LDcgQEAgV2Vi SW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAg dGhpcy50b2dnbGVOZXdBdHRyaWJ1dGVCdXR0b24oZmFsc2UpOwogICAgICAgICAgICAgdmFyIGF0 dHJpYnV0ZSA9IGxpc3RJdGVtLmdldEVsZW1lbnRzQnlDbGFzc05hbWUoIndlYmtpdC1odG1sLWF0 dHJpYnV0ZSIpWzBdOwogICAgICAgICAgICAgaWYgKGF0dHJpYnV0ZSkKLSAgICAgICAgICAgICAg ICByZXR1cm4gdGhpcy5fc3RhcnRFZGl0aW5nQXR0cmlidXRlKGF0dHJpYnV0ZSwgYXR0cmlidXRl LmdldEVsZW1lbnRzQnlDbGFzc05hbWUoIndlYmtpdC1odG1sLWF0dHJpYnV0ZS1uYW1lIilbMF0p OworICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLl9zdGFydEVkaXRpbmdBdHRyaWJ1dGUoYXR0 cmlidXRlLCBhdHRyaWJ1dGUuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgid2Via2l0LWh0bWwtYXR0 cmlidXRlLXZhbHVlIilbMF0pOwogCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fYWRkTmV3QXR0 cmlidXRlKGxpc3RJdGVtKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDM1ODJmOTYuLmE5NWRhZTMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwor KysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAg LTM3Niw3ICszNzYsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiA9IGZ1 bmN0aW9uKHN0eWxlUnVsZSwgc3VidGl0bGUsIGNvbXB1dGVkU3R5bAogewogICAgIFdlYkluc3Bl Y3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbi5jYWxsKHRoaXMsIHN0eWxlUnVsZS5zZWxlY3RvclRleHQp OwogCi0gICAgdGhpcy50aXRsZUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBmdW5j dGlvbihlKSB7IGUuc3RvcFByb3BhZ2F0aW9uKCk7IH0sIGZhbHNlKTsKKyAgICB0aGlzLnRpdGxl RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2NsaWNrU2VsZWN0b3IuYmlu ZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMudGl0bGVFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIo ImRibGNsaWNrIiwgdGhpcy5fZGJsY2xpY2tTZWxlY3Rvci5iaW5kKHRoaXMpLCBmYWxzZSk7CiAg ICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fZGJsY2xp Y2tFbXB0eVNwYWNlLmJpbmQodGhpcyksIGZhbHNlKTsKIApAQCAtNTkxLDYgKzU5MSwxOSBAQCBX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAg IHJldHVybiBpdGVtOwogICAgIH0sCiAKKyAgICBfY2xpY2tTZWxlY3RvcjogZnVuY3Rpb24oZXZl bnQpCisgICAgeworICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKKworICAgICAgICAv LyBEb24ndCBzZWFyY2ggIkNvbXB1dGVkIFN0eWxlcyIsICJTdHlsZSBBdHRyaWJ1dGUiLCBvciBN YXBwZWQgQXR0cmlidXRlcy4KKyAgICAgICAgaWYgKHRoaXMuY29tcHV0ZWRTdHlsZSB8fCAhdGhp cy5ydWxlIHx8IHRoaXMucnVsZS5pc1VzZXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAg ICAgdmFyIHNlYXJjaEVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VhcmNoIik7 CisgICAgICAgIHNlYXJjaEVsZW1lbnQudmFsdWUgPSB0aGlzLnN0eWxlUnVsZS5zZWxlY3RvclRl eHQ7CisgICAgICAgIFdlYkluc3BlY3Rvci5wZXJmb3JtU2VhcmNoKHsgdGFyZ2V0OiBzZWFyY2hF bGVtZW50IH0pOworICAgIH0sCisKICAgICBfZGJsY2xpY2tFbXB0eVNwYWNlOiBmdW5jdGlvbihl dmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuZXhwYW5kKCk7Cg==