20281 2008-08-04 17:22:11 -0700 DOM attribute editing should be triggered on double-click (not single click) 2008-08-05 15:34:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 timothy timothy aroben oldest_to_newest 87814 0 timothy 2008-08-04 17:22:11 -0700 Currently DOM attribute editing is triggered with a single click after the element is selected. Many times I have entered editing mode on accident and find it annoying. We should make it happen on double-click like the style editing. 87819 1 aroben 2008-08-04 18:49:42 -0700 (In reply to comment #0) > We should make it happen on double-click like the style editing. Double-clicking already has a meaning in the DOM tree: it re-roots the tree on the element you double-clicked. We've also gotten complaints that double-click-to-edit in the Styles pane is hard to discover compared to Firebug's single-click-to-edit. So I'm not sure that making this change would be a definite win. See bug 17224 for more discussion about single- vs. double-click. 87868 2 22654 timothy 2008-08-05 08:21:20 -0700 Created attachment 22654 Proposed patch 87869 3 timothy 2008-08-05 08:27:48 -0700 (In reply to comment #1) > (In reply to comment #0) > > We should make it happen on double-click like the style editing. > > Double-clicking already has a meaning in the DOM tree: it re-roots the tree on > the element you double-clicked. We've also gotten complaints that > double-click-to-edit in the Styles pane is hard to discover compared to > Firebug's single-click-to-edit. So I'm not sure that making this change would > be a definite win. > > See bug 17224 for more discussion about single- vs. double-click. We are already doing different things for double-click. In TOT, when double-clicking a DOM attribute we stay in the editing mode that was started with the first click. So you already have to double click the empty space or the tag name. I also wasn't the only one to voice concern for the single click to edit behavior in bug 17224. Matt Lilek (pewtermoose) also thought it would be annoying. I think this is just one case where we are different than Firebug. I can't really think of any other single-click-to-edit designs. 87888 4 22654 aroben 2008-08-05 13:47:49 -0700 Comment on attachment 22654 Proposed patch r=me 87896 5 timothy 2008-08-05 15:34:26 -0700 Landed in r35576. 22654 2008-08-05 08:21:20 -0700 2008-08-05 13:47:49 -0700 Proposed patch 0001-Makes-DOM-attribute-editing-start-on-double.patch text/plain 10937 timothy RnJvbSBkMTgyZDYxYmQzN2M2OTNlNDdkZjY1ZTE1MjlkNjk3MjA3ZTU5OTQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBUdWUsIDUgQXVnIDIwMDggMDc6MzQ6MTAgLTA3MDAKU3ViamVjdDogW1BBVENIXSAgICAg ICAgIE1ha2VzIERPTSBhdHRyaWJ1dGUgZWRpdGluZyBzdGFydCBvbiBkb3VibGUtY2xpY2sgdG8g bWF0Y2ggdGhlIHN0eWxlcwogICAgICAgICBwYW5lLiBMaW5rcyBpbiBhdHRyaWJ1dGVzIGFyZSBu b3cgdHJpZ2dlcmVkIHdpdGggYSBzaW5nbGUgY2xpY2sgYWdhaW4uCgogICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDI4MQoKICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanM6IFJlbW92ZWQgc29tZSBzdHJpbmdzLgogICAgICAgICogcGFnZS9pbnNwZWN0b3IvRWxl bWVudHNQYW5lbC5qczoKICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudC5w cm90b3R5cGUub25hdHRhY2gpOiBDYWxsCiAgICAgICAgX3ByZXZlbnRGb2xsb3dpbmdMaW5rc09u RG91YmxlQ2xpY2suCiAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlVHJlZUVsZW1lbnQucHJv dG90eXBlLl9wcmV2ZW50Rm9sbG93aW5nTGlua3NPbkRvdWJsZUNsaWNrKToKICAgICAgICBSZW5h bWVkIGZyb20gX21ha2VVUkxzQWN0aXZhdGVPbk1vZGlmaWVkQ2xpY2suIFNpbXBseSBzZXRzIHRo ZQogICAgICAgIHByZXZlbnRGb2xsb3dPbkRvdWJsZUNsaWNrIHByb3BlcnR5IG9uIGFsbCBsaW5r cy4KICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudC5wcm90b3R5cGUub25z ZWxlY3QpOiBSZW1vdmVkCiAgICAgICAgX3NlbGVjdGVkQnlDdXJyZW50TW91c2VEb3duLgogICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbm1vdXNlZG93 bik6IE1vdmVkCiAgICAgICAgZWRpdGluZyBjb2RlIHRvIG9uZGJsY2xpY2suCiAgICAgICAgKFdl Ykluc3BlY3Rvci5ET01Ob2RlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGJsY2xpY2spOiBDYWxs cwogICAgICAgIF9zdGFydEVkaXRpbmcuIFJlbW92ZWQgVVJMIGNoZWNrLgogICAgICAgIChXZWJJ bnNwZWN0b3IuRE9NTm9kZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fdXBkYXRlVGl0bGUpOiBDYWxs cwogICAgICAgIF9wcmV2ZW50Rm9sbG93aW5nTGlua3NPbkRvdWJsZUNsaWNrLgogICAgICAgICog cGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzczoKICAgICAgICAoLmVkaXRpbmcpOiBSZW1vdmVk IHRoZSB0ZXh0LWRlY29yYXRpb24gcHJvcGVydHkuCiAgICAgICAgKC5lZGl0aW5nLCAuZWRpdGlu ZyAqKTogQWRkZWQgdGhlIHRleHQtZGVjb3JhdGlvbiBwcm9wZXJ0eSBoZXJlCiAgICAgICAgc28g aXQgcmVtb3ZlcyB1bmRlcmxpbmVzIG9uIGNoaWxkIGVsZW1lbnRzLgogICAgICAgICogcGFnZS9p bnNwZWN0b3IvaW5zcGVjdG9yLmpzOgogICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGlj ayk6IFJlbW92ZWQgdGhlIGZvbGxvd09uQWx0Q2xpY2sgY29kZS4KICAgICAgICBBZGRlZCBzdXBw b3J0IGZvciBwcmV2ZW50Rm9sbG93T25Eb3VibGVDbGljaywgd2hpY2ggc2V0cyBhIHRpbWVvdXQK ICAgICAgICBvbiB0aGUgZmlyc3QgY2xpY2sgd2hlcmUgZnV0dXJlIGNsaWNrcyB3aWxsIGNhbmNl bCBpdCAoZG91YmxlIGNsaWNrKS4KICAgICAgICBJZiB0aGUgdGltZW91dCBpc24ndCBjYW5jZWxl ZCwgdGhlIGxpbmsgaXMgZm9sbG93ZWQuCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDM0ICsrKysrKysrKysrKysrKysrKysrKysKIFdlYkNvcmUvRW5n bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIHwgIEJpbiAxNTU5NCAtPiAxNTAxMCBieXRl cwogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9FbGVtZW50c1BhbmVsLmpzICAgfCAgIDQ1ICsrKysr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9y LmNzcyAgICAgIHwgICAgMiArLQogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanMg ICAgICAgfCAgIDI2ICsrKysrKysrKysrLS0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgNjEgaW5zZXJ0 aW9ucygrKSwgNDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkYmUxNWEwLi4zOTY0MmQ5IDEwMDY0NAotLS0gYS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBA CisyMDA4LTA4LTA1ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAg ICAgICBNYWtlcyBET00gYXR0cmlidXRlIGVkaXRpbmcgc3RhcnQgb24gZG91YmxlLWNsaWNrIHRv IG1hdGNoIHRoZSBzdHlsZXMKKyAgICAgICAgcGFuZS4gTGlua3MgaW4gYXR0cmlidXRlcyBhcmUg bm93IHRyaWdnZXJlZCB3aXRoIGEgc2luZ2xlIGNsaWNrIGFnYWluLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDI4MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOiBSZW1vdmVkIHNvbWUgc3RyaW5ncy4KKyAgICAgICAgKiBwYWdlL2luc3Bl Y3Rvci9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVl RWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOiBDYWxsCisgICAgICAgIF9wcmV2ZW50Rm9sbG93 aW5nTGlua3NPbkRvdWJsZUNsaWNrLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVl RWxlbWVudC5wcm90b3R5cGUuX3ByZXZlbnRGb2xsb3dpbmdMaW5rc09uRG91YmxlQ2xpY2spOgor ICAgICAgICBSZW5hbWVkIGZyb20gX21ha2VVUkxzQWN0aXZhdGVPbk1vZGlmaWVkQ2xpY2suIFNp bXBseSBzZXRzIHRoZQorICAgICAgICBwcmV2ZW50Rm9sbG93T25Eb3VibGVDbGljayBwcm9wZXJ0 eSBvbiBhbGwgbGlua3MuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZVRyZWVFbGVtZW50 LnByb3RvdHlwZS5vbnNlbGVjdCk6IFJlbW92ZWQKKyAgICAgICAgX3NlbGVjdGVkQnlDdXJyZW50 TW91c2VEb3duLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudC5wcm90 b3R5cGUub25tb3VzZWRvd24pOiBNb3ZlZAorICAgICAgICBlZGl0aW5nIGNvZGUgdG8gb25kYmxj bGljay4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlVHJlZUVsZW1lbnQucHJvdG90eXBl Lm9uZGJsY2xpY2spOiBDYWxscworICAgICAgICBfc3RhcnRFZGl0aW5nLiBSZW1vdmVkIFVSTCBj aGVjay4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlVHJlZUVsZW1lbnQucHJvdG90eXBl Ll91cGRhdGVUaXRsZSk6IENhbGxzCisgICAgICAgIF9wcmV2ZW50Rm9sbG93aW5nTGlua3NPbkRv dWJsZUNsaWNrLgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3M6CisgICAg ICAgICguZWRpdGluZyk6IFJlbW92ZWQgdGhlIHRleHQtZGVjb3JhdGlvbiBwcm9wZXJ0eS4KKyAg ICAgICAgKC5lZGl0aW5nLCAuZWRpdGluZyAqKTogQWRkZWQgdGhlIHRleHQtZGVjb3JhdGlvbiBw cm9wZXJ0eSBoZXJlCisgICAgICAgIHNvIGl0IHJlbW92ZXMgdW5kZXJsaW5lcyBvbiBjaGlsZCBl bGVtZW50cy4KKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGljayk6IFJlbW92ZWQgdGhlIGZvbGxvd09uQWx0Q2xp Y2sgY29kZS4KKyAgICAgICAgQWRkZWQgc3VwcG9ydCBmb3IgcHJldmVudEZvbGxvd09uRG91Ymxl Q2xpY2ssIHdoaWNoIHNldHMgYSB0aW1lb3V0CisgICAgICAgIG9uIHRoZSBmaXJzdCBjbGljayB3 aGVyZSBmdXR1cmUgY2xpY2tzIHdpbGwgY2FuY2VsIGl0IChkb3VibGUgY2xpY2spLgorICAgICAg ICBJZiB0aGUgdGltZW91dCBpc24ndCBjYW5jZWxlZCwgdGhlIGxpbmsgaXMgZm9sbG93ZWQuCisK IDIwMDgtMDgtMDQgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAg ICAgIE1ha2VzIHRoZSBzZWxlY3Rpb24gc3Vycm91bmQganVzdCB0aGUgbmFtZSBvciB2YWx1ZSB0 aGF0IHdhcwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMgYi9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA1 YmNhM2RhMDc3ZTBiZjRlMTMwOWYzZTJiZjQ0NzM4Zjc1NGYxZDhiLi5mNTk1ZTNiNjliNjJiNTM4 MmY5ODQyOTdhMzlhYzI4YWQ0YTAxMzlmIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDE3 ClpjbWFEPXh1fHIqR3RTTmJ4TW0xIUp8PzUwMDAzNygydnpfOQoKZGVsdGEgMzY5CnpjbVoyZmBs QG9uR2Z3IyZoN3R4e2hHZDJ1aEQ7IXQmN2M2fT1MNS1OaDcySEdLRGtne1JNaW5FaSZxczt6M09C fQp6QSQ/YHNEJDlXODdYeHQjJFY3RF8pV09XMGUyPEg1XkRFOU4wOyZaLU1gUXZXbH1FX0krV3Jo Z3NmQWdnTmt+MTQKUTw4X0h2NEtzZ3BqZyo9SzBJOFp4SH47X3UKCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvaW5zcGVjdG9yL0VsZW1lbnRzUGFuZWwuanMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVj dG9yL0VsZW1lbnRzUGFuZWwuanMKaW5kZXggYWZjZTBlZS4uYmZhNmYxMCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wYWdlL2luc3BlY3Rvci9FbGVtZW50c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvcGFn ZS9pbnNwZWN0b3IvRWxlbWVudHNQYW5lbC5qcwpAQCAtMTEzNSwzNiArMTEzNSwxNyBAQCBXZWJJ bnNwZWN0b3IuRE9NTm9kZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAg IHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMu b25tb3VzZWRvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogCi0gICAgICAgIHRoaXMuX21ha2VVUkxz QWN0aXZhdGVPbk1vZGlmaWVkQ2xpY2soKTsKKyAgICAgICAgdGhpcy5fcHJldmVudEZvbGxvd2lu Z0xpbmtzT25Eb3VibGVDbGljaygpOwogICAgIH0sCiAKLSAgICBfbWFrZVVSTHNBY3RpdmF0ZU9u TW9kaWZpZWRDbGljazogZnVuY3Rpb24oKQorICAgIF9wcmV2ZW50Rm9sbG93aW5nTGlua3NPbkRv dWJsZUNsaWNrOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgbGlua3MgPSB0aGlzLmxp c3RJdGVtRWxlbWVudC5xdWVyeVNlbGVjdG9yQWxsKCJsaSA+IC53ZWJraXQtaHRtbC10YWcgPiAu d2Via2l0LWh0bWwtYXR0cmlidXRlID4gLndlYmtpdC1odG1sLWV4dGVybmFsLWxpbmssIGxpID4g LndlYmtpdC1odG1sLXRhZyA+IC53ZWJraXQtaHRtbC1hdHRyaWJ1dGUgPiAud2Via2l0LWh0bWwt cmVzb3VyY2UtbGluayIpOwogICAgICAgICBpZiAoIWxpbmtzKQogICAgICAgICAgICAgcmV0dXJu OwogCi0gICAgICAgIHZhciBpc01hYyA9IEluc3BlY3RvckNvbnRyb2xsZXIucGxhdGZvcm0oKS5p bmRleE9mKCJtYWMiKSA9PSAwOwotCi0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGlua3Mu bGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBsaW5rID0gbGlua3NbaV07Ci0gICAgICAg ICAgICB2YXIgaXNFeHRlcm5hbCA9IGxpbmsuaGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtZXh0 ZXJuYWwtbGluayIpOwotICAgICAgICAgICAgdmFyIGhyZWYgPSBsaW5rLmdldEF0dHJpYnV0ZSgi aHJlZiIpOwotICAgICAgICAgICAgdmFyIHRpdGxlOwotICAgICAgICAgICAgaWYgKGlzTWFjKSB7 Ci0gICAgICAgICAgICAgICAgaWYgKGlzRXh0ZXJuYWwpCi0gICAgICAgICAgICAgICAgICAgIHRp dGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPcHRpb24tY2xpY2sgdG8gdmlzaXQgJXMuIiwg aHJlZik7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICB0aXRsZSA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3B0aW9uLWNsaWNrIHRvIHNob3cgJXMuIiwgaHJlZik7 Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGlmIChpc0V4dGVybmFsKQot ICAgICAgICAgICAgICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQWx0LWNs aWNrIHRvIHZpc2l0ICVzLiIsIGhyZWYpOwotICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAg ICAgICAgICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFsdC1jbGljayB0byBz aG93ICVzLiIsIGhyZWYpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgbGluay5zZXRBdHRy aWJ1dGUoInRpdGxlIiwgdGl0bGUpOwotICAgICAgICAgICAgbGluay5mb2xsb3dPbkFsdENsaWNr ID0gdHJ1ZTsKLSAgICAgICAgfQorICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxpbmtzLmxl bmd0aDsgKytpKQorICAgICAgICAgICAgbGlua3NbaV0ucHJldmVudEZvbGxvd09uRG91YmxlQ2xp Y2sgPSB0cnVlOwogICAgIH0sCiAKICAgICBvbnBvcHVsYXRlOiBmdW5jdGlvbigpCkBAIC0xMjgy LDcgKzEyNjMsNiBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKIAogICAgIG9uc2VsZWN0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9zZWxl Y3RlZEJ5Q3VycmVudE1vdXNlRG93biA9IHRydWU7CiAgICAgICAgIHRoaXMudHJlZU91dGxpbmUu cGFuZWwuZm9jdXNlZERPTU5vZGUgPSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0OwogICAgICAgICB0 aGlzLnVwZGF0ZVNlbGVjdGlvbigpOwogICAgIH0sCkBAIC0xMjkyLDEzICsxMjcyLDYgQEAgV2Vi SW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0 aGlzLl9lZGl0aW5nKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmICh0aGlzLl9z ZWxlY3RlZEJ5Q3VycmVudE1vdXNlRG93bikKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9zZWxl Y3RlZEJ5Q3VycmVudE1vdXNlRG93bjsKLSAgICAgICAgZWxzZSBpZiAodGhpcy5fc3RhcnRFZGl0 aW5nKGV2ZW50KSkgewotICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKLSAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCiAgICAgICAgIC8vIFByZXZlbnQgc2VsZWN0aW5n IHRoZSBuZWFyZXN0IHdvcmQgb24gZG91YmxlIGNsaWNrLgogICAgICAgICBpZiAoZXZlbnQuZGV0 YWlsID49IDIpCiAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwpAQCAtMTMwOSw2 ICsxMjgyLDkgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGlmICh0aGlzLl9lZGl0aW5nKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAg ICAgIGlmICh0aGlzLl9zdGFydEVkaXRpbmcoZXZlbnQpKQorICAgICAgICAgICAgcmV0dXJuOwor CiAgICAgICAgIHZhciBwYW5lbCA9IHRoaXMudHJlZU91dGxpbmUucGFuZWw7CiAgICAgICAgIHBh bmVsLnJvb3RET01Ob2RlID0gdGhpcy5wYXJlbnQucmVwcmVzZW50ZWRPYmplY3Q7CiAgICAgICAg IHBhbmVsLmZvY3VzZWRET01Ob2RlID0gdGhpcy5yZXByZXNlbnRlZE9iamVjdDsKQEAgLTEzNDUs MTAgKzEzMjEsNiBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICAgICAgaWYgKCFhdHRyaWJ1dGVOYW1lRWxlbWVudCkKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgICAgICB2YXIgaXNVUkwgPSBldmVudC50YXJnZXQuZW5jbG9zaW5nTm9k ZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpIHx8IGV2ZW50LnRh cmdldC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aENsYXNzKCJ3ZWJraXQtaHRtbC1yZXNvdXJjZS1s aW5rIik7Ci0gICAgICAgIGlmIChpc1VSTCAmJiBldmVudC5hbHRLZXkpCi0gICAgICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0KICAgICAgICAgdmFyIGF0dHJpYnV0ZU5hbWUgPSBhdHRyaWJ1dGVOYW1l RWxlbWVudC5pbm5lclRleHQ7CiAKICAgICAgICAgZnVuY3Rpb24gcmVtb3ZlWmVyb1dpZHRoU3Bh Y2VSZWN1cnNpdmUobm9kZSkKQEAgLTE0MzEsNyArMTQwMyw2IEBAIFdlYkluc3BlY3Rvci5ET01O b2RlVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVUaXRsZSgp OwogICAgIH0sCiAKLQogICAgIF9lZGl0aW5nQ2FuY2VsbGVkOiBmdW5jdGlvbihlbGVtZW50LCBj b250ZXh0KQogICAgIHsKICAgICAgICAgZGVsZXRlIHRoaXMuX2VkaXRpbmc7CkBAIC0xNDQ0LDcg KzE0MTUsNyBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy50aXRsZSA9IG5vZGVUaXRsZUluZm8uY2FsbCh0aGlzLnJlcHJlc2VudGVk T2JqZWN0LCB0aGlzLmhhc0NoaWxkcmVuLCBXZWJJbnNwZWN0b3IubGlua2lmeVVSTCkudGl0bGU7 CiAgICAgICAgIGRlbGV0ZSB0aGlzLnNlbGVjdGlvbkVsZW1lbnQ7CiAgICAgICAgIHRoaXMudXBk YXRlU2VsZWN0aW9uKCk7Ci0gICAgICAgIHRoaXMuX21ha2VVUkxzQWN0aXZhdGVPbk1vZGlmaWVk Q2xpY2soKTsKKyAgICAgICAgdGhpcy5fcHJldmVudEZvbGxvd2luZ0xpbmtzT25Eb3VibGVDbGlj aygpOwogICAgIH0sCiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5z cGVjdG9yLmNzcyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcwppbmRleCA5 ZmFiYjg5Li4yNGZjMGRiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3Bl Y3Rvci5jc3MKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzCkBAIC0x MTU4LDEyICsxMTU4LDEyIEBAIGJvZHkuaW5hY3RpdmUgLnBsYWNhcmQuc2VsZWN0ZWQgewogICAg IHBhZGRpbmctbGVmdDogMnB4OwogICAgIG1hcmdpbi1ib3R0b206IC0xcHg7CiAgICAgcGFkZGlu Zy1ib3R0b206IDFweDsKLSAgICB0ZXh0LWRlY29yYXRpb246IG5vbmUgIWltcG9ydGFudDsKICAg ICBvcGFjaXR5OiAxLjAgIWltcG9ydGFudDsKIH0KIAogLmVkaXRpbmcsIC5lZGl0aW5nICogewog ICAgIGNvbG9yOiBibGFjayAhaW1wb3J0YW50OworICAgIHRleHQtZGVjb3JhdGlvbjogbm9uZSAh aW1wb3J0YW50OwogfQogCiAuc2VjdGlvbiAucHJvcGVydGllcyBsaS5lZGl0aW5nIHsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9wYWdl L2luc3BlY3Rvci9pbnNwZWN0b3IuanMKaW5kZXggNjUzNGIwMi4uN2E4ZDQxMCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9wYWdl L2luc3BlY3Rvci9pbnNwZWN0b3IuanMKQEAgLTM5OSwxOCArMzk5LDI4IEBAIFdlYkluc3BlY3Rv ci5kb2N1bWVudENsaWNrID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgaWYgKCFhbmNob3IpCiAgICAg ICAgIHJldHVybjsKIAotICAgIGlmIChhbmNob3IuZm9sbG93T25BbHRDbGljayAmJiAhZXZlbnQu YWx0S2V5KSB7Ci0gICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7Ci0gICAgICAgIHJldHVy bjsKKyAgICAvLyBQcmV2ZW50IHRoZSBsaW5rIGZyb20gbmF2aWdhdGluZywgc2luY2Ugd2UgZG9u J3QgZG8gYW55IG5hdmlnYXRpb24gYnkgZm9sbG93aW5nIGxpbmtzIG5vcm1hbGx5LgorICAgIGV2 ZW50LnByZXZlbnREZWZhdWx0KCk7CisKKyAgICBmdW5jdGlvbiBmb2xsb3dMaW5rKCkKKyAgICB7 CisgICAgICAgIC8vIEZJWE1FOiBzdXBwb3J0IHdlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsgbGlu a3MgaGVyZS4KKyAgICAgICAgaWYgKGFuY2hvci5oYXNTdHlsZUNsYXNzKCJ3ZWJraXQtaHRtbC1y ZXNvdXJjZS1saW5rIikpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlRm9y VVJMKGFuY2hvci5ocmVmLCBhbmNob3IubGluZU51bWJlciwgYW5jaG9yLnByZWZlcnJlZFBhbmVs KTsKICAgICB9CiAKLSAgICBpZiAoIWFuY2hvci5oYXNTdHlsZUNsYXNzKCJ3ZWJraXQtaHRtbC1y ZXNvdXJjZS1saW5rIikpCi0gICAgICAgIHJldHVybjsKKyAgICBpZiAoV2ViSW5zcGVjdG9yLmZv bGxvd0xpbmtUaW1lb3V0KQorICAgICAgICBjbGVhclRpbWVvdXQoV2ViSW5zcGVjdG9yLmZvbGxv d0xpbmtUaW1lb3V0KTsKIAotICAgIGlmIChXZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlRm9yVVJM KGFuY2hvci5ocmVmLCBhbmNob3IubGluZU51bWJlciwgYW5jaG9yLnByZWZlcnJlZFBhbmVsKSkg ewotICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwotICAgICAgICBldmVudC5zdG9wUHJv cGFnYXRpb24oKTsKKyAgICBpZiAoYW5jaG9yLnByZXZlbnRGb2xsb3dPbkRvdWJsZUNsaWNrKSB7 CisgICAgICAgIC8vIFN0YXJ0IGEgdGltZW91dCBpZiB0aGlzIGlzIHRoZSBmaXJzdCBjbGljaywg aWYgdGhlIHRpbWVvdXQgaXMgY2FuY2VsZWQKKyAgICAgICAgLy8gYmVmb3JlIGl0IGZpcmVzLCB0 aGVuIGEgZG91YmxlIGNsaWNrZWQgaGFwcGVuZWQgb3IgYW5vdGhlciBsaW5rIHdhcyBjbGlja2Vk LgorICAgICAgICBpZiAoZXZlbnQuZGV0YWlsID09PSAxKQorICAgICAgICAgICAgV2ViSW5zcGVj dG9yLmZvbGxvd0xpbmtUaW1lb3V0ID0gc2V0VGltZW91dChmb2xsb3dMaW5rLCAzMzMpOworICAg ICAgICByZXR1cm47CiAgICAgfQorCisgICAgZm9sbG93TGluaygpOwogfQogCiBXZWJJbnNwZWN0 b3IuZG9jdW1lbnRLZXlEb3duID0gZnVuY3Rpb24oZXZlbnQpCi0tIAoxLjUuNC40Cgo=