28978 2009-09-04 10:28:27 -0700 Color swatches should show before the color text 2009-09-04 11:11:28 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 timothy webkit-unassigned aroben joepeck timothy oldest_to_newest 144861 0 timothy 2009-09-04 10:28:27 -0700 Color swatches currenly show up after the property value. They should be moved to before the color text. This was clicking on the swatch will toggle the color and not shift the click area for the swatch. 144866 1 39075 timothy 2009-09-04 10:48:10 -0700 Created attachment 39075 Proposed Change shift the swatch. Also makes multiple swatches in the single property toggle the color format. https://bugs.webkit.org/show_bug.cgi?id=28978 Reviewed by NOBODY (OOPS!). * inspector/front-end/StylesSidebarPane.js: (WebInspector.StylePropertyTreeElement.prototype.updateTitle): Some refactoring to consolidate the processing we do on the property value. This eliminated the old nickname code, since the new WebInspector.Color class handles this. We could also simplify the color regex since more is handled by the Color class. Also no longer uses innerHTML for the linkify code. (WebInspector.StylePropertyTreeElement.prototype.updateTitle.processValue): Helper function to process a value given a regex and processor functions. (WebInspector.StylePropertyTreeElement.prototype.updateTitle.linkifyURL): Make an anchor for the URL with "url()" syntax surrounding it. (WebInspector.StylePropertyTreeElement.prototype.updateTitle.processColor): Makes a color, if there was an exception just return a text node. (WebInspector.StylePropertyTreeElement.prototype.updateTitle.processColor.changeColorDisplay.changeTo): Moved from later in the file. (WebInspector.StylePropertyTreeElement.prototype.updateTitle.processColor.changeColorDisplay): Ditto. * inspector/front-end/inspector.css: --- 3 files changed, 142 insertions(+), 127 deletions(-) 144874 2 timothy 2009-09-04 11:10:01 -0700 Committed rr48065: <http://trac.webkit.org/changeset/r48065> 144875 3 timothy 2009-09-04 11:11:28 -0700 http://trac.webkit.org/changeset/48065 39075 2009-09-04 10:48:10 -0700 2009-09-04 10:51:22 -0700 Proposed Change bug-28978-20090904104808.patch text/plain 14070 timothy ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTBjMjkyYy4uYTg4NDBlZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAwOS0wOS0wNCAgVGltb3RoeSBIYXRj aGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKKyAgICAgICAgU2hvdyBjb2xvciBzd2F0Y2hlcyBp biB0aGUgV2ViIEluc3BlY3RvciBiZWZvcmUgdGhlIGNvbG9yIHRleHQgc28gY2xpY2tpbmcgdGhl bSB3aWxsIG5vdAorICAgICAgICBzaGlmdCB0aGUgc3dhdGNoLiBBbHNvIG1ha2VzIG11bHRpcGxl IHN3YXRjaGVzIGluIHRoZSBzaW5nbGUgcHJvcGVydHkgdG9nZ2xlIHRoZSBjb2xvciBmb3JtYXQu CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4OTc4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUudXBkYXRlVGl0bGUpOiBTb21l IHJlZmFjdG9yaW5nIHRvIGNvbnNvbGlkYXRlCisgICAgICAgIHRoZSBwcm9jZXNzaW5nIHdlIGRv IG9uIHRoZSBwcm9wZXJ0eSB2YWx1ZS4gVGhpcyBlbGltaW5hdGVkIHRoZSBvbGQgbmlja25hbWUg Y29kZSwgc2luY2UgdGhlIG5ldworICAgICAgICBXZWJJbnNwZWN0b3IuQ29sb3IgY2xhc3MgaGFu ZGxlcyB0aGlzLiBXZSBjb3VsZCBhbHNvIHNpbXBsaWZ5IHRoZSBjb2xvciByZWdleCBzaW5jZSBt b3JlCisgICAgICAgIGlzIGhhbmRsZWQgYnkgdGhlIENvbG9yIGNsYXNzLiBBbHNvIG5vIGxvbmdl ciB1c2VzIGlubmVySFRNTCBmb3IgdGhlIGxpbmtpZnkgY29kZS4KKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLnVwZGF0ZVRpdGxlLnByb2Nl c3NWYWx1ZSk6IEhlbHBlciBmdW5jdGlvbiB0bworICAgICAgICBwcm9jZXNzIGEgdmFsdWUgZ2l2 ZW4gYSByZWdleCBhbmQgcHJvY2Vzc29yIGZ1bmN0aW9ucy4gCisgICAgICAgIChXZWJJbnNwZWN0 b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS51cGRhdGVUaXRsZS5saW5raWZ5 VVJMKTogTWFrZSBhbiBhbmNob3IgZm9yIHRoZQorICAgICAgICBVUkwgd2l0aCAidXJsKCkiIHN5 bnRheCBzdXJyb3VuZGluZyBpdC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5 VHJlZUVsZW1lbnQucHJvdG90eXBlLnVwZGF0ZVRpdGxlLnByb2Nlc3NDb2xvcik6IE1ha2VzIGEg Y29sb3IsIGlmCisgICAgICAgIHRoZXJlIHdhcyBhbiBleGNlcHRpb24ganVzdCByZXR1cm4gYSB0 ZXh0IG5vZGUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50 LnByb3RvdHlwZS51cGRhdGVUaXRsZS5wcm9jZXNzQ29sb3IuY2hhbmdlQ29sb3JEaXNwbGF5LmNo YW5nZVRvKToKKyAgICAgICAgTW92ZWQgZnJvbSBsYXRlciBpbiB0aGUgZmlsZS4KKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLnVwZGF0ZVRp dGxlLnByb2Nlc3NDb2xvci5jaGFuZ2VDb2xvckRpc3BsYXkpOiBEaXR0by4KKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3M6CisKIDIwMDktMDktMDMgIEtldmluIFdh dHRlcnMgIDxrZXZpbndhdHRlcnNAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtl dmluIE9sbGl2aWVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzCmluZGV4IGM2NTJmOWEuLjQ0Y2Y0YTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcworKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTc4Nyw0OSArNzg3LDE0 IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog CiAgICAgdXBkYXRlVGl0bGU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIC8vICJOaWNrbmFt ZXMiIGZvciBzb21lIGNvbW1vbiB2YWx1ZXMgdGhhdCBhcmUgZWFzaWVyIHRvIHJlYWQuCi0gICAg ICAgIHZhciB2YWx1ZU5pY2tuYW1lcyA9IHsKLSAgICAgICAgICAgICJyZ2IoMCwgMCwgMCkiOiAi YmxhY2siLAotICAgICAgICAgICAgIiMwMDAiOiAiYmxhY2siLAotICAgICAgICAgICAgIiMwMDAw MDAiOiAiYmxhY2siLAotICAgICAgICAgICAgInJnYigyNTUsIDI1NSwgMjU1KSI6ICJ3aGl0ZSIs Ci0gICAgICAgICAgICAiI2ZmZiI6ICJ3aGl0ZSIsCi0gICAgICAgICAgICAiI2ZmZmZmZiI6ICJ3 aGl0ZSIsCi0gICAgICAgICAgICAiI0ZGRiI6ICJ3aGl0ZSIsCi0gICAgICAgICAgICAiI0ZGRkZG RiI6ICJ3aGl0ZSIsCi0gICAgICAgICAgICAicmdiYSgwLCAwLCAwLCAwKSI6ICJ0cmFuc3BhcmVu dCIsCi0gICAgICAgICAgICAicmdiKDI1NSwgMCwgMCkiOiAicmVkIiwKLSAgICAgICAgICAgICJy Z2IoMCwgMjU1LCAwKSI6ICJsaW1lIiwKLSAgICAgICAgICAgICJyZ2IoMCwgMCwgMjU1KSI6ICJi bHVlIiwKLSAgICAgICAgICAgICJyZ2IoMjU1LCAyNTUsIDApIjogInllbGxvdyIsCi0gICAgICAg ICAgICAicmdiKDI1NSwgMCwgMjU1KSI6ICJtYWdlbnRhIiwKLSAgICAgICAgICAgICJyZ2IoMCwg MjU1LCAyNTUpIjogImN5YW4iCi0gICAgICAgIH07Ci0KICAgICAgICAgdmFyIHByaW9yaXR5ID0g dGhpcy5wcmlvcml0eTsKICAgICAgICAgdmFyIHZhbHVlID0gdGhpcy52YWx1ZTsKLSAgICAgICAg dmFyIGh0bWxWYWx1ZSA9IHZhbHVlOwogCiAgICAgICAgIGlmIChwcmlvcml0eSAmJiAhcHJpb3Jp dHkubGVuZ3RoKQogICAgICAgICAgICAgZGVsZXRlIHByaW9yaXR5OwogICAgICAgICBpZiAocHJp b3JpdHkpCiAgICAgICAgICAgICBwcmlvcml0eSA9ICIhIiArIHByaW9yaXR5OwogCi0gICAgICAg IGlmICh2YWx1ZSkgewotICAgICAgICAgICAgdmFyIHVybHMgPSB2YWx1ZS5tYXRjaCgvdXJsXChb XildK1wpLyk7Ci0gICAgICAgICAgICBpZiAodXJscykgewotICAgICAgICAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgdXJscy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgICAgICAgICB2 YXIgdXJsID0gdXJsc1tpXS5zdWJzdHJpbmcoNCwgdXJsc1tpXS5sZW5ndGggLSAxKTsKLSAgICAg ICAgICAgICAgICAgICAgaHRtbFZhbHVlID0gaHRtbFZhbHVlLnJlcGxhY2UodXJsc1tpXSwgInVy bCgiICsgV2ViSW5zcGVjdG9yLmxpbmtpZnlVUkwodXJsKSArICIpIik7Ci0gICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBpZiAodmFsdWUgaW4g dmFsdWVOaWNrbmFtZXMpCi0gICAgICAgICAgICAgICAgICAgIGh0bWxWYWx1ZSA9IHZhbHVlTmlj a25hbWVzW3ZhbHVlXTsKLSAgICAgICAgICAgICAgICBodG1sVmFsdWUgPSBodG1sVmFsdWUuZXNj YXBlSFRNTCgpOwotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIGh0 bWxWYWx1ZSA9IHZhbHVlID0gIiI7Ci0KICAgICAgICAgdGhpcy51cGRhdGVTdGF0ZSgpOwogCiAg ICAgICAgIHZhciBlbmFibGVkQ2hlY2tib3hFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiaW5wdXQiKTsKQEAgLTg0NSw5ICs4MTAsMTIxIEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3Bl cnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciB2YWx1ZUVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAgICAgIHZhbHVlRWxlbWVudC5j bGFzc05hbWUgPSAidmFsdWUiOwotICAgICAgICB2YWx1ZUVsZW1lbnQuaW5uZXJIVE1MID0gaHRt bFZhbHVlOwogICAgICAgICB0aGlzLnZhbHVlRWxlbWVudCA9IHZhbHVlRWxlbWVudDsKIAorICAg ICAgICBpZiAodmFsdWUpIHsKKyAgICAgICAgICAgIGZ1bmN0aW9uIHByb2Nlc3NWYWx1ZShyZWdl eCwgcHJvY2Vzc29yLCBuZXh0UHJvY2Vzc29yLCB2YWx1ZVRleHQpCisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgdmFyIGNvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZURvY3VtZW50RnJh Z21lbnQoKTsKKworICAgICAgICAgICAgICAgIHZhciBpdGVtcyA9IHZhbHVlVGV4dC5yZXBsYWNl KHJlZ2V4LCAiXDAkMVwwIikuc3BsaXQoIlwwIik7CisgICAgICAgICAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCBpdGVtcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgICAgICBpZiAo KGkgJSAyKSA9PT0gMCkgeworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG5leHRQcm9jZXNz b3IpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGFpbmVyLmFwcGVuZENoaWxkKG5l eHRQcm9jZXNzb3IoaXRlbXNbaV0pKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb250YWluZXIuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUoaXRlbXNbaV0pKTsKKyAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIHZhciBwcm9jZXNzZWROb2RlID0gcHJvY2Vzc29yKGl0 ZW1zW2ldKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChwcm9jZXNzZWROb2RlKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRhaW5lci5hcHBlbmRDaGlsZChwcm9jZXNzZWRO b2RlKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgICAgIHJldHVybiBjb250YWluZXI7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAg IGZ1bmN0aW9uIGxpbmtpZnlVUkwodXJsKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IHZhciBjb250YWluZXIgPSBkb2N1bWVudC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CisgICAg ICAgICAgICAgICAgY29udGFpbmVyLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCJ1cmwoIikpOworICAgICAgICAgICAgICAgIGNvbnRhaW5lci5hcHBlbmRDaGlsZChXZWJJbnNw ZWN0b3IubGlua2lmeVVSTEFzTm9kZSh1cmwsIHVybCwgbnVsbCwgKHVybCBpbiBXZWJJbnNwZWN0 b3IucmVzb3VyY2VVUkxNYXApKSk7CisgICAgICAgICAgICAgICAgY29udGFpbmVyLmFwcGVuZENo aWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCIpIikpOworICAgICAgICAgICAgICAgIHJldHVy biBjb250YWluZXI7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIHByb2Nl c3NDb2xvcih0ZXh0KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHRyeSB7CisgICAg ICAgICAgICAgICAgICAgIHZhciBjb2xvciA9IG5ldyBXZWJJbnNwZWN0b3IuQ29sb3IodGV4dCk7 CisgICAgICAgICAgICAgICAgfSBjYXRjaCAoZSkgeworICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUodGV4dCk7CisgICAgICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAgICAgdmFyIHN3YXRjaEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzcGFuIik7CisgICAgICAgICAgICAgICAgc3dhdGNoRWxlbWVudC5jbGFzc05hbWUgPSAic3dh dGNoIjsKKyAgICAgICAgICAgICAgICBzd2F0Y2hFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJi YWNrZ3JvdW5kLWNvbG9yIiwgdGV4dCk7CisKKyAgICAgICAgICAgICAgICBzd2F0Y2hFbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgY2hhbmdlQ29sb3JEaXNwbGF5LCBmYWxzZSk7Cisg ICAgICAgICAgICAgICAgc3dhdGNoRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIs IGZ1bmN0aW9uKGV2ZW50KSB7IGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpIH0sIGZhbHNlKTsKKwor ICAgICAgICAgICAgICAgIHZhciBjb2xvclZhbHVlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoInNwYW4iKTsKKyAgICAgICAgICAgICAgICBjb2xvclZhbHVlRWxlbWVudC50ZXh0Q29u dGVudCA9IHRleHQ7CisKKyAgICAgICAgICAgICAgICB2YXIgbW9kZSA9IGNvbG9yLm1vZGU7Cisg ICAgICAgICAgICAgICAgZnVuY3Rpb24gY2hhbmdlQ29sb3JEaXNwbGF5KGV2ZW50KSB7CisgICAg ICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGNoYW5nZVRvKG5ld01vZGUsIGNvbnRlbnQpIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgIG1vZGUgPSBuZXdNb2RlOworICAgICAgICAgICAgICAgICAg ICAgICAgY29sb3JWYWx1ZUVsZW1lbnQudGV4dENvbnRlbnQgPSBjb250ZW50OworICAgICAgICAg ICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICAgICAgc3dpdGNoIChtb2RlKSB7CisgICAg ICAgICAgICAgICAgICAgICAgICBjYXNlICJyZ2IiOgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNoYW5nZVRvKCJoc2wiLCBjb2xvci50b0hzbCgpKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSAic2hvcnRoZXgi OgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYW5nZVRvKCJoZXgiLCBjb2xvci50b0hl eCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAg ICAgICAgICAgICAgY2FzZSAiaGV4IjoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGFu Z2VUbygicmdiIiwgY29sb3IudG9SZ2IoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg YnJlYWs7CisKKyAgICAgICAgICAgICAgICAgICAgICAgIGNhc2UgIm5pY2tuYW1lIjoKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpZiAoY29sb3Iuc2ltcGxlKSB7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGlmIChjb2xvci5oYXNTaG9ydEhleCgpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY2hhbmdlVG8oInNob3J0aGV4IiwgY29sb3IudG9TaG9y dEhleCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhbmdlVG8oImhleCIsIGNvbG9yLnRvSGV4KCkp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjaGFuZ2VUbygicmdiYSIsIGNvbG9yLnRvUmdiYSgpKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgICAgICAgICAgY2Fz ZSAiaHNsIjoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoY29sb3Iubmlja25hbWUp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYW5nZVRvKCJuaWNrbmFtZSIsIGNv bG9yLnRvTmlja25hbWUoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAo Y29sb3IuaGFzU2hvcnRIZXgoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hh bmdlVG8oInNob3J0aGV4IiwgY29sb3IudG9TaG9ydEhleCgpKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYW5nZVRv KCJoZXgiLCBjb2xvci50b0hleCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVh azsKKworICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSAicmdiYSI6CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY2hhbmdlVG8oImhzbGEiLCBjb2xvci50b0hzbGEoKSk7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICAgICAgICAgIGNh c2UgImhzbGEiOgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChjb2xvci5uaWNrbmFt ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhbmdlVG8oIm5pY2tuYW1lIiwg Y29sb3IudG9OaWNrbmFtZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYW5nZVRvKCJyZ2JhIiwgY29sb3IudG9S Z2JhKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg ICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgdmFyIGNvbnRh aW5lciA9IGRvY3VtZW50LmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKTsKKyAgICAgICAgICAgICAg ICBjb250YWluZXIuYXBwZW5kQ2hpbGQoc3dhdGNoRWxlbWVudCk7CisgICAgICAgICAgICAgICAg Y29udGFpbmVyLmFwcGVuZENoaWxkKGNvbG9yVmFsdWVFbGVtZW50KTsKKyAgICAgICAgICAgICAg ICByZXR1cm4gY29udGFpbmVyOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICB2YXIgY29s b3JSZWdleCA9IC8oKD86cmdifGhzbClhP1woW14pXStcKXwjWzAtOWEtZkEtRl17Nn18I1swLTlh LWZBLUZdezN9fFxiXHcrXGIpL2c7CisgICAgICAgICAgICB2YXIgY29sb3JQcm9jZXNzb3IgPSBw cm9jZXNzVmFsdWUuYmluZCh3aW5kb3csIGNvbG9yUmVnZXgsIHByb2Nlc3NDb2xvciwgbnVsbCk7 CisKKyAgICAgICAgICAgIHZhbHVlRWxlbWVudC5hcHBlbmRDaGlsZChwcm9jZXNzVmFsdWUoL3Vy bFwoKFteKV0rKVwpL2csIGxpbmtpZnlVUkwsIGNvbG9yUHJvY2Vzc29yLCB2YWx1ZSkpOworICAg ICAgICB9CisKICAgICAgICAgaWYgKHByaW9yaXR5KSB7CiAgICAgICAgICAgICB2YXIgcHJpb3Jp dHlFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICAgICAg cHJpb3JpdHlFbGVtZW50LmNsYXNzTmFtZSA9ICJwcmlvcml0eSI7CkBAIC04NzAsOTUgKzk0Nyw3 IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog CiAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZVRleHROb2RlKCI7IikpOwogCi0gICAgICAgIGlmICh2YWx1ZSkgewotICAgICAgICAgICAgLy8g RklYTUU6IHRoaXMgb25seSBjb3ZlcnMgVzNDIGFuZCBDU1MgMTYgdmFsaWQgY29sb3IgbmFtZXMK LSAgICAgICAgICAgIHZhciBjb2xvcnMgPSB2YWx1ZS5tYXRjaCgvKChyZ2J8aHNsKWE/XChbXild K1wpKXwoI1swLTlhLWZBLUZdezZ9KXwoI1swLTlhLWZBLUZdezN9KXxhcXVhfGJsYWNrfGJsdWV8 ZnVjaHNpYXxncmF5fGdyZWVufGxpbWV8bWFyb29ufG5hdnl8b2xpdmV8cHVycGxlfHJlZHxzaWx2 ZXJ8dGVhbHx3aGl0ZXx5ZWxsb3d8dHJhbnNwYXJlbnQvZyk7Ci0gICAgICAgICAgICB2YXIgc3dh dGNoOwotICAgICAgICAgICAgaWYgKGNvbG9ycykgewotICAgICAgICAgICAgICAgIHZhciBjb2xv cnNMZW5ndGggPSBjb2xvcnMubGVuZ3RoOwotICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgY29sb3JzTGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHN3YXRj aEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgICAgICAg ICAgICAgIHN3YXRjaEVsZW1lbnQuY2xhc3NOYW1lID0gInN3YXRjaCI7Ci0gICAgICAgICAgICAg ICAgICAgIHN3YXRjaEVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoImJhY2tncm91bmQtY29sb3Ii LCBjb2xvcnNbaV0pOwotICAgICAgICAgICAgICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5h cHBlbmRDaGlsZChzd2F0Y2hFbGVtZW50KTsKLSAgICAgICAgICAgICAgICAgICAgc3dhdGNoID0g c3dhdGNoRWxlbWVudDsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0KLSAgICAg ICAgICAgIC8vIFJvdGF0ZSB0aHJvdWdoIENvbG9yIFJlcHJlc2VudGF0aW9ucyBieSBDbGlja2lu ZyBvbiB0aGUgU3dhdGNoCi0gICAgICAgICAgICAvLyBTaW1wbGU6IHJnYiAtPiBoc2wgLT4gbmlj a25hbWU/IC0+IHNob3J0aGV4PyAtPiBoZXggLT4gLi4uCi0gICAgICAgICAgICAvLyBBZHZhbmNl ZDogcmdiYSAtPiBoc2xhIC0+IG5pY2tuYW1lPyAtPiAuLi4gICAgICAgICAgICAKLSAgICAgICAg ICAgIGlmIChjb2xvcnMgJiYgY29sb3JzLmxlbmd0aCA9PT0gMSkgewotICAgICAgICAgICAgICAg IHRyeSB7Ci0gICAgICAgICAgICAgICAgICAgIHZhciBjb2xvciA9IG5ldyBXZWJJbnNwZWN0b3Iu Q29sb3IoaHRtbFZhbHVlKTsKLSAgICAgICAgICAgICAgICB9IGNhdGNoKGUpIHsKLSAgICAgICAg ICAgICAgICAgICAgdmFyIGNvbG9yID0gbnVsbDsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAg ICAgICAgICAgICBpZiAoY29sb3IpIHsKLSAgICAgICAgICAgICAgICAgICAgc3dhdGNoLmFkZEV2 ZW50TGlzdGVuZXIoImNsaWNrIiwgY2hhbmdlQ29sb3JEaXNwbGF5LCBmYWxzZSk7Ci0gICAgICAg ICAgICAgICAgICAgIHN3YXRjaC5hZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIGZ1bmN0aW9u KGV2ZW50KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24o KTsKLSAgICAgICAgICAgICAgICAgICAgfSwgZmFsc2UpOwotCi0gICAgICAgICAgICAgICAgICAg IHZhciBtb2RlID0gY29sb3IubW9kZTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHZhbHVlRWxl bWVudCA9IHRoaXMudmFsdWVFbGVtZW50OwotICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBj aGFuZ2VDb2xvckRpc3BsYXkoZXZlbnQpIHsKLQotICAgICAgICAgICAgICAgICAgICAgICAgZnVu Y3Rpb24gY2hhbmdlVG8obmV3TW9kZSwgY29udGVudCkgewotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1vZGUgPSBuZXdNb2RlOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVl RWxlbWVudC50ZXh0Q29udGVudCA9IGNvbnRlbnQ7Ci0gICAgICAgICAgICAgICAgICAgICAgICB9 Ci0KLSAgICAgICAgICAgICAgICAgICAgICAgIHN3aXRjaCAobW9kZSkgewotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNhc2UgInJnYiI6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNoYW5nZVRvKCJoc2wiLCBjb2xvci50b0hzbCgpKTsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYXNlICJz aG9ydGhleCI6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYW5nZVRvKCJoZXgi LCBjb2xvci50b0hleCgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 Ci0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYXNlICJoZXgiOgotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjaGFuZ2VUbygicmdiIiwgY29sb3IudG9SZ2IoKSk7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgY2FzZSAibmlja25hbWUiOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAoY29sb3Iuc2ltcGxlKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAoY29sb3IuaGFzU2hvcnRIZXgoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjaGFuZ2VUbygic2hvcnRoZXgiLCBjb2xvci50b1Nob3J0SGV4KCkpOwotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNoYW5nZVRvKCJoZXgiLCBjb2xvci50b0hleCgpKTsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjaGFuZ2VUbygicmdiYSIsIGNvbG9yLnRvUmdiYSgpKTsKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjYXNlICJoc2wiOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo Y29sb3Iubmlja25hbWUpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGFu Z2VUbygibmlja25hbWUiLCBjb2xvci50b05pY2tuYW1lKCkpOwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBlbHNlIGlmIChjb2xvci5oYXNTaG9ydEhleCgpKQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY2hhbmdlVG8oInNob3J0aGV4IiwgY29sb3IudG9TaG9y dEhleCgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhbmdlVG8oImhleCIsIGNvbG9yLnRvSGV4KCkp OwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNhc2UgInJnYmEiOgotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjaGFuZ2VUbygiaHNsYSIsIGNvbG9yLnRvSHNsYSgpKTsKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYXNl ICJoc2xhIjoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGNvbG9yLm5pY2tu YW1lKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhbmdlVG8oIm5pY2tu YW1lIiwgY29sb3IudG9OaWNrbmFtZSgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZWxzZQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hhbmdlVG8oInJn YmEiLCBjb2xvci50b1JnYmEoKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgdGhp cy50b29sdGlwID0gdGhpcy5uYW1lICsgIjogIiArICh2YWx1ZU5pY2tuYW1lc1t2YWx1ZV0gfHwg dmFsdWUpICsgKHByaW9yaXR5ID8gIiAiICsgcHJpb3JpdHkgOiAiIik7CisgICAgICAgIHRoaXMu dG9vbHRpcCA9IHRoaXMubmFtZSArICI6ICIgKyB2YWx1ZUVsZW1lbnQudGV4dENvbnRlbnQgKyAo cHJpb3JpdHkgPyAiICIgKyBwcmlvcml0eSA6ICIiKTsKICAgICB9LAogCiAgICAgdXBkYXRlQWxs OiBmdW5jdGlvbih1cGRhdGVBbGxSdWxlcykKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5jc3MKaW5kZXggMjYxNTQ0Zi4uYTNmNmVkMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKQEAgLTE0NDAsMTEgKzE0NDAsMTIgQEAgbGkuZWRpdGlu ZyAuc3dhdGNoLCBsaS5lZGl0aW5nIC5lbmFibGVkLWJ1dHRvbiB7CiAuc3dhdGNoIHsKICAgICBk aXNwbGF5OiBpbmxpbmUtYmxvY2s7CiAgICAgdmVydGljYWwtYWxpZ246IGJhc2VsaW5lOwotICAg IG1hcmdpbi1sZWZ0OiA0cHg7CisgICAgbWFyZ2luLWxlZnQ6IDFweDsKKyAgICBtYXJnaW4tcmln aHQ6IDJweDsKICAgICBtYXJnaW4tYm90dG9tOiAtMXB4OwogICAgIHdpZHRoOiAxZW07CiAgICAg aGVpZ2h0OiAxZW07Ci0gICAgYm9yZGVyOiAxcHggc29saWQgcmdiKDE4MCwgMTgwLCAxODApOwor ICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYmEoMTI4LCAxMjgsIDEyOCwgMC42KTsKIH0KIAogLnBh bmU6bm90KC5leHBhbmRlZCkgKyAucGFuZSwgLnBhbmU6Zmlyc3Qtb2YtdHlwZSB7