44300 2010-08-19 15:42:20 -0700 Web Inspector: elements css: single click to edit properties and values 2012-02-20 03:47:14 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED DUPLICATE 78881 P2 Normal --- 0 phazei apavlov apavlov bweinstein joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 267008 0 phazei 2010-08-19 15:42:20 -0700 It seems it would be much simpler to edit the properties and values with a single click rather than a double click. Since while editing a page, those values could be changed a whole lot over and over again, double clicking becomes quite the pain. The selector should remain double clicked to edit since it isn't edited nearly as much. If there it's a matter of all one or the other, single click for all would be preferable. 267019 1 joepeck 2010-08-19 16:04:18 -0700 Thanks for filing the bug. We've talked about this in the past. In fact, there is another bug that is very similar: <http://webkit.org/b/36965> Web Inspector: start editing DOM and styles on click-and-pause. 267141 2 pfeldman 2010-08-19 23:01:55 -0700 I think Tim implemented it as double-click years ago because he was avoiding non-standard behavior. The idea was that it was either a text area with single click editing or a number of double-click actions. Later, I tried implementing click-and-pause, but it did not really improve the experience. Now the interesting part. We are currently working on changing the way we edit styles entirely (model-wise, not ui-wise). We are improving css parser so that it does not drop unrecognized properties (-moz, ones with syntax errors and such). As a result, we will be editing pretty much formatted original source code, not today's pure webcore model data. As a part of the change, we are likely to start committing entire style bodies on changes to style properties (instead of today's individual properties commits). This brings us much closer to editing style in a single text area. 500730 3 apavlov 2011-11-11 06:27:41 -0800 *** Bug 62715 has been marked as a duplicate of this bug. *** 504883 4 115597 apavlov 2011-11-17 08:28:28 -0800 Created attachment 115597 Patch 504890 5 apavlov 2011-11-17 08:38:21 -0800 This is a strawman proposal. Please apply to see it in action. 506434 6 timothy 2011-11-19 12:52:04 -0800 I agree with Pavel. If the whole rule feels like a editable text area, then I think single click is fine. 510605 7 115597 pfeldman 2011-11-29 01:44:33 -0800 Comment on attachment 115597 Patch Clearing r? since this change is not about requesting the code review. 560156 8 apavlov 2012-02-20 03:47:14 -0800 Fixed in bug 78881. *** This bug has been marked as a duplicate of bug 78881 *** 115597 2011-11-17 08:28:28 -0800 2011-11-29 01:44:32 -0800 Patch bug-44300-20111117202826.patch text/plain 10419 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjI0NzQyY2YyOTlkMTVl ODZmZGY4MjQyZTE0N2Y1OWE4OTdlN2VkOC4uZDA0YWJmZDI4Y2MzNWFjMTNmNDI4NWVmYTgwZWRk YTIwYjk3ODU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTE3ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogZWxlbWVudHMgY3NzOiBzaW5nbGUgY2xpY2sgdG8gZWRpdCBwcm9wZXJ0aWVzIGFuZCB2 YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0 MzAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLl9oYW5kbGVFbXB0eVNwYWNl RG91YmxlQ2xpY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rp b24ucHJvdG90eXBlLl9leHBhbmRBbmRTdGFydEVkaXRpbmdCbGFuayk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuX2hhbmRsZVNlbGVjdG9y Q2xpY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJv dG90eXBlLl9zdGFydEVkaXRpbmdPbk1vdXNlRXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUuZWxlbWVudC51c2VySW5wdXQu cHJldmlvdXNDb250ZW50LmNvbnRleHQubW92ZURpcmVjdGlvbik6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQ cm9tcHQucHJvdG90eXBlLl9zdGFydEVkaXRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvdHJlZW91dGxpbmUuanM6CisgICAgICAgIChUcmVlRWxlbWVudC50cmVlRWxlbWVudFRv Z2dsZWQpOgorICAgICAgICAoVHJlZUVsZW1lbnQudHJlZUVsZW1lbnREb3VibGVDbGlja2VkKToK KwogMjAxMS0xMS0xNyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAg ICAgICAgTm90IHJldmlld2VkOiBmaXggSUUgdXNlciBhZ2VudHMgc3RyaW5ncyBpbiB0aGUgaW5z cGVjdG9yLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T dHlsZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggYzRmMGUwZGE5YWU4NzQzNTRkZjQ4MTMxZmEzNDZj NGMxMWYzYTU4Yy4uNjAzNjYyNDIyNmJiYjY0NjIzMmJlOTMxMmRkNDIyNzljNGVhYmVhNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFy UGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzCkBAIC04NzEsNyArODcxLDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVy dGllc1NlY3Rpb24gPSBmdW5jdGlvbihwYXJlbnRQYW5lLCBzdHlsZVJ1bGUsIGVkaXRhYmxlLAog ICAgIGNsb3NlQnJhY2UudGV4dENvbnRlbnQgPSAifSI7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKGNsb3NlQnJhY2UpOwogCi0gICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5faGFuZGxlU2VsZWN0b3JEb3VibGVDbGljay5iaW5k KHRoaXMpLCBmYWxzZSk7CisgICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoImNsaWNrIiwgdGhpcy5faGFuZGxlU2VsZWN0b3JDbGljay5iaW5kKHRoaXMpLCBmYWxzZSk7 CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5faGFu ZGxlRW1wdHlTcGFjZURvdWJsZUNsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMu X3BhcmVudFBhbmUgPSBwYXJlbnRQYW5lOwpAQCAtMTE0NSwxNiArMTE0NSwxOSBAQCBXZWJJbnNw ZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBl dmVudC5zdG9wUHJvcGFnYXRpb24oKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQot ICAgICAgICB0aGlzLmV4cGFuZCgpOwotICAgICAgICB0aGlzLmFkZE5ld0JsYW5rUHJvcGVydHko KS5zdGFydEVkaXRpbmcoKTsKKworICAgICAgICB0aGlzLl9leHBhbmRBbmRTdGFydEVkaXRpbmdC bGFuaygpOwogICAgIH0sCiAKLSAgICBfaGFuZGxlU2VsZWN0b3JDbGljazogZnVuY3Rpb24oZXZl bnQpCisgICAgX2V4cGFuZEFuZFN0YXJ0RWRpdGluZ0JsYW5rOiBmdW5jdGlvbigpCiAgICAgewot ICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKKyAgICAgICAgdGhpcy5leHBhbmQoKTsK KyAgICAgICAgdmFyIGJsYW5rUHJvcGVydHkgPSB0aGlzLmFkZE5ld0JsYW5rUHJvcGVydHkoKTsK KyAgICAgICAgaWYgKCFibGFua1Byb3BlcnR5LnN0YXJ0RWRpdGluZygpKQorICAgICAgICAgICAg YmxhbmtQcm9wZXJ0eS50cmVlT3V0bGluZS5yZW1vdmVDaGlsZChibGFua1Byb3BlcnR5KTsKICAg ICB9LAogCi0gICAgX2hhbmRsZVNlbGVjdG9yRG91YmxlQ2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQor ICAgIF9oYW5kbGVTZWxlY3RvckNsaWNrOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAg IHRoaXMuX3N0YXJ0RWRpdGluZ09uTW91c2VFdmVudCgpOwogICAgICAgICBldmVudC5zdG9wUHJv cGFnYXRpb24oKTsKQEAgLTExNjYsOCArMTE2OSw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3Bl cnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAg ICBpZiAoIXRoaXMucnVsZSAmJiB0aGlzLnByb3BlcnRpZXNUcmVlT3V0bGluZS5jaGlsZHJlbi5s ZW5ndGggPT09IDApIHsKLSAgICAgICAgICAgIHRoaXMuZXhwYW5kKCk7Ci0gICAgICAgICAgICB0 aGlzLmFkZE5ld0JsYW5rUHJvcGVydHkoKS5zdGFydEVkaXRpbmcoKTsKKyAgICAgICAgICAgIHRo aXMuX2V4cGFuZEFuZFN0YXJ0RWRpdGluZ0JsYW5rKCk7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KIApAQCAtMTc5NCw3ICsxNzk2LDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVy dHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg bG9uZ2hhbmRQcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgbmFtZSA9 IGxvbmdoYW5kUHJvcGVydGllc1tpXS5uYW1lOwogCi0KICAgICAgICAgICAgIGlmICh0aGlzLnRy ZWVPdXRsaW5lLnNlY3Rpb24pIHsKICAgICAgICAgICAgICAgICB2YXIgaW5oZXJpdGVkID0gdGhp cy50cmVlT3V0bGluZS5zZWN0aW9uLmlzUHJvcGVydHlJbmhlcml0ZWQobmFtZSk7CiAgICAgICAg ICAgICAgICAgdmFyIG92ZXJsb2FkZWQgPSB0aGlzLnRyZWVPdXRsaW5lLnNlY3Rpb24uaXNQcm9w ZXJ0eU92ZXJsb2FkZWQobmFtZSk7CkBAIC0xODA2LDMxICsxODA3LDUyIEBAIFdlYkluc3BlY3Rv ci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAg fSwKIAorICAgIF9pc1RyZWVFbGVtZW50RWRpdGFibGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIC8vIEZJWE1FOiB3ZSBkb24ndCBhbGxvdyBlZGl0aW5nIG9mIGxvbmdoYW5kIHByb3BlcnRp ZXMgdW5kZXIgYSBzaG9ydGhhbmQgcmlnaHQgbm93LgorICAgICAgICBpZiAodGhpcy5wYXJlbnQu c2hvcnRoYW5kKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIGlmICh0aGlz LnRyZWVPdXRsaW5lLnNlY3Rpb24gJiYgIXRoaXMudHJlZU91dGxpbmUuc2VjdGlvbi5lZGl0YWJs ZSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICB9LAorCiAgICAgb25kYmxjbGljazogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0 aGlzLnN0YXJ0RWRpdGluZyhldmVudC50YXJnZXQpOworICAgICAgICBpZiAodGhpcy5fcGFyZW50 UGFuZS5faXNFZGl0aW5nU3R5bGUpIHsKKyAgICAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlv bigpOworICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKyAgICAgICAgfQorICAg IH0sCisKKyAgICBvbmNsaWNrOiBmdW5jdGlvbihldmVudCkKKyAgICB7CiAgICAgICAgIGV2ZW50 LnN0b3BQcm9wYWdhdGlvbigpOworICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAg IH0sCiAKLSAgICByZXN0b3JlTmFtZUVsZW1lbnQ6IGZ1bmN0aW9uKCkKKyAgICBzZWxlY3RPbk1v dXNlRG93bjogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICAvLyBSZXN0b3JlIDxzcGFu IGNsYXNzPSJ3ZWJraXQtY3NzLXByb3BlcnR5Ij4gaWYgaXQgZG9lc24ndCB5ZXQgZXhpc3Qgb3Ig d2FzIGFjY2lkZW50YWxseSBkZWxldGVkLgotICAgICAgICBpZiAodGhpcy5uYW1lRWxlbWVudCA9 PT0gdGhpcy5saXN0SXRlbUVsZW1lbnQucXVlcnlTZWxlY3RvcigiLndlYmtpdC1jc3MtcHJvcGVy dHkiKSkKKyAgICAgICAgaWYgKCF0aGlzLl9pc1RyZWVFbGVtZW50RWRpdGFibGUoKSB8fCB0aGlz LmlzRXZlbnRXaXRoaW5EaXNjbG9zdXJlVHJpYW5nbGUoZXZlbnQpIHx8IGV2ZW50LnRhcmdldC50 cmVlRWxlbWVudCA9PT0gdGhpcykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlz Lm5hbWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgICAgICB0 aGlzLm5hbWVFbGVtZW50LmNsYXNzTmFtZSA9ICJ3ZWJraXQtY3NzLXByb3BlcnR5IjsKLSAgICAg ICAgdGhpcy5uYW1lRWxlbWVudC50ZXh0Q29udGVudCA9ICIiOwotICAgICAgICB0aGlzLmxpc3RJ dGVtRWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5uYW1lRWxlbWVudCwgdGhpcy5saXN0SXRlbUVs ZW1lbnQuZmlyc3RDaGlsZCk7CisgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOworCisg ICAgICAgIGlmICghdGhpcy50cmVlT3V0bGluZS5zZWN0aW9uLl9hZnRlclVwZGF0ZSAmJiAhdGhp cy5fcGFyZW50UGFuZS5faXNFZGl0aW5nU3R5bGUpIHsKKyAgICAgICAgICAgIGV2ZW50LnByZXZl bnREZWZhdWx0KCk7CisgICAgICAgICAgICB0aGlzLnN0YXJ0RWRpdGluZyhldmVudC50YXJnZXQp OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgdmFyIGluZGV4ID0g dGhpcy50cmVlT3V0bGluZS5jaGlsZHJlbi5pbmRleE9mKHRoaXMpOworICAgICAgICB0aGlzLl9w YXJlbnRQYW5lLl9uZXdFZGl0aW5nVGFyZ2V0ID0geyBzZWN0aW9uOiB0aGlzLnRyZWVPdXRsaW5l LnNlY3Rpb24sIGluZGV4OiBpbmRleCwgZWRpdE5hbWVGaWVsZDogISFldmVudC50YXJnZXQuZW5j bG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWNzcy1wcm9wZXJ0eSIpIH07CiAgICAg fSwKIAogICAgIHN0YXJ0RWRpdGluZzogZnVuY3Rpb24oc2VsZWN0RWxlbWVudCkKICAgICB7Ci0g ICAgICAgIC8vIEZJWE1FOiB3ZSBkb24ndCBhbGxvdyBlZGl0aW5nIG9mIGxvbmdoYW5kIHByb3Bl cnRpZXMgdW5kZXIgYSBzaG9ydGhhbmQgcmlnaHQgbm93LgotICAgICAgICBpZiAodGhpcy5wYXJl bnQuc2hvcnRoYW5kKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGlmICh0aGlzLnRy ZWVPdXRsaW5lLnNlY3Rpb24gJiYgIXRoaXMudHJlZU91dGxpbmUuc2VjdGlvbi5lZGl0YWJsZSkK KyAgICAgICAgaWYgKCF0aGlzLl9pc1RyZWVFbGVtZW50RWRpdGFibGUoKSkKICAgICAgICAgICAg IHJldHVybjsKIAogICAgICAgICBpZiAoIXNlbGVjdEVsZW1lbnQpCkBAIC0xOTExLDYgKzE5MzMs NyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHByb3h5RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJwYXN0ZSIsIHBhc3Rl SGFuZGxlci5iaW5kKHRoaXMsIGNvbnRleHQpKTsKIAogICAgICAgICB3aW5kb3cuZ2V0U2VsZWN0 aW9uKCkuc2V0QmFzZUFuZEV4dGVudChzZWxlY3RFbGVtZW50LCAwLCBzZWxlY3RFbGVtZW50LCAx KTsKKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwKIAogICAgIGVkaXRpbmdOYW1lVmFsdWVL ZXlEb3duOiBmdW5jdGlvbihjb250ZXh0LCBldmVudCkKQEAgLTIwODYsOSArMjEwOSwyMSBAQCBX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAg ICAgLy8gVGhlIENhbGxiYWNrIHRvIHN0YXJ0IGVkaXRpbmcgdGhlIG5leHQvcHJldmlvdXMgcHJv cGVydHkvc2VsZWN0b3IuCiAgICAgICAgIGZ1bmN0aW9uIG1vdmVUb05leHRDYWxsYmFjayhhbHJl YWR5TmV3LCB2YWx1ZUNoYW5nZWQsIHNlY3Rpb24pCiAgICAgICAgIHsKLSAgICAgICAgICAgIGlm ICghbW92ZURpcmVjdGlvbikKKyAgICAgICAgICAgIHZhciBuZXdFZGl0aW5nVGFyZ2V0ID0gdGhp cy5fcGFyZW50UGFuZS5fbmV3RWRpdGluZ1RhcmdldDsKKyAgICAgICAgICAgIGlmICghbW92ZURp cmVjdGlvbiAmJiAhbmV3RWRpdGluZ1RhcmdldCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAK KyAgICAgICAgICAgIGlmIChuZXdFZGl0aW5nVGFyZ2V0KSB7CisgICAgICAgICAgICAgICAgdmFy IHNhbWVTZWN0aW9uID0gbmV3RWRpdGluZ1RhcmdldC5zZWN0aW9uID09PSBzZWN0aW9uOworICAg ICAgICAgICAgICAgIHNlY3Rpb24gPSBuZXdFZGl0aW5nVGFyZ2V0LnNlY3Rpb247CisgICAgICAg ICAgICAgICAgbW92ZVRvSW5kZXggPSBuZXdFZGl0aW5nVGFyZ2V0LmluZGV4OworICAgICAgICAg ICAgICAgIGlmIChzYW1lU2VjdGlvbiAmJiBibGFua0lucHV0ICYmICFhbHJlYWR5TmV3KQorICAg ICAgICAgICAgICAgICAgICAtLW1vdmVUb0luZGV4OyAvLyBBY2NvdW50IGZvciB0aGUgY2FzZSBv ZiBhIHJlbW92ZWQgcHJvcGVydHkuCisgICAgICAgICAgICAgICAgaXNFZGl0aW5nTmFtZSA9ICFu ZXdFZGl0aW5nVGFyZ2V0LmVkaXROYW1lRmllbGQ7CisgICAgICAgICAgICAgICAgbW92ZVRvID0g e307IC8vIEZha2UgdGFyZ2V0IG9iamVjdCB0byBiZSByZWNhbGN1bGF0ZWQgYmVsb3cuCisgICAg ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3BhcmVudFBhbmUuX25ld0VkaXRpbmdUYXJnZXQ7Cisg ICAgICAgICAgICB9CisKICAgICAgICAgICAgIC8vIFVzZXIganVzdCB0YWJiZWQgdGhyb3VnaCB3 aXRob3V0IGNoYW5nZXMuCiAgICAgICAgICAgICBpZiAobW92ZVRvICYmIG1vdmVUby5wYXJlbnQp IHsKICAgICAgICAgICAgICAgICBtb3ZlVG8uc3RhcnRFZGl0aW5nKCFpc0VkaXRpbmdOYW1lID8g bW92ZVRvLm5hbWVFbGVtZW50IDogbW92ZVRvLnZhbHVlRWxlbWVudCk7CkBAIC0yMTIyLDcgKzIx NTcsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAg IGlmIChhYmFuZG9uTmV3UHJvcGVydHkpIHsKKyAgICAgICAgICAgIGlmIChhYmFuZG9uTmV3UHJv cGVydHkgJiYgbW92ZURpcmVjdGlvbikgewogICAgICAgICAgICAgICAgIHZhciBzZWN0aW9uVG9F ZGl0ID0gbW92ZURpcmVjdGlvbiA9PT0gImJhY2t3YXJkIiA/IHNlY3Rpb24gOiBzZWN0aW9uLm5l eHRFZGl0YWJsZVNpYmxpbmcoKTsKICAgICAgICAgICAgICAgICBpZiAoc2VjdGlvblRvRWRpdCkg ewogICAgICAgICAgICAgICAgICAgICBpZiAoc2VjdGlvblRvRWRpdC5ydWxlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzCmluZGV4IGQ4NGI2 Zjk3Mzk5Njk3MTMxODQ5ZjA2MzBiZmRjNzg2N2EwOWVjZjIuLjZkNzIzNDYzNDJkNTJmOGVmZTdi YjlkMjdkYjQ1ZjIxYTBiYjJlOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGV4dFByb21wdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RleHRQcm9tcHQuanMKQEAgLTE2MCwxNCArMTYwLDE0IEBAIFdlYkluc3BlY3Rv ci5UZXh0UHJvbXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg dGhpcy5faXNFZGl0aW5nID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRTdHlsZUNs YXNzKCJlZGl0aW5nIik7Ci0gICAgICAgIGlmIChibHVyTGlzdGVuZXIpIHsKLSAgICAgICAgICAg IHRoaXMuX2JsdXJMaXN0ZW5lciA9IGJsdXJMaXN0ZW5lcjsKLSAgICAgICAgICAgIHRoaXMuX2Vs ZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiYmx1ciIsIHRoaXMuX2JsdXJMaXN0ZW5lciwgZmFsc2Up OwotICAgICAgICB9CiAgICAgICAgIHRoaXMuX29sZFRhYkluZGV4ID0gdGhpcy5fZWxlbWVudC50 YWJJbmRleDsKICAgICAgICAgaWYgKHRoaXMuX2VsZW1lbnQudGFiSW5kZXggPCAwKQogICAgICAg ICAgICAgdGhpcy5fZWxlbWVudC50YWJJbmRleCA9IDA7CiAgICAgICAgIFdlYkluc3BlY3Rvci5z ZXRDdXJyZW50Rm9jdXNFbGVtZW50KHRoaXMuX2VsZW1lbnQpOworICAgICAgICBpZiAoYmx1ckxp c3RlbmVyKSB7CisgICAgICAgICAgICB0aGlzLl9ibHVyTGlzdGVuZXIgPSBibHVyTGlzdGVuZXI7 CisgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImJsdXIiLCB0aGlz Ll9ibHVyTGlzdGVuZXIsIGZhbHNlKTsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBfc3RvcEVk aXRpbmc6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvdHJlZW91dGxpbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL3RyZWVvdXRsaW5lLmpzCmluZGV4IDEwMDM5OGI4NDBlMTAyZTU1MTIyY2VlOTIzZDBjNjU3 N2IxMTAwOTQuLmYxNmEyNTkyNDZjOTcwMDIwZjAxODBiNTA1ZTUzNDRhYzg5MWM0OWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdHJlZW91dGxpbmUuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcwpA QCAtNjY4LDggKzY2OCwxMSBAQCBUcmVlRWxlbWVudC50cmVlRWxlbWVudFRvZ2dsZWQgPSBmdW5j dGlvbihldmVudCkKIAogICAgIHZhciB0b2dnbGVPbkNsaWNrID0gZWxlbWVudC50cmVlRWxlbWVu dC50b2dnbGVPbkNsaWNrICYmICFlbGVtZW50LnRyZWVFbGVtZW50LnNlbGVjdGFibGU7CiAgICAg dmFyIGlzSW5UcmlhbmdsZSA9IGVsZW1lbnQudHJlZUVsZW1lbnQuaXNFdmVudFdpdGhpbkRpc2Ns b3N1cmVUcmlhbmdsZShldmVudCk7Ci0gICAgaWYgKCF0b2dnbGVPbkNsaWNrICYmICFpc0luVHJp YW5nbGUpCisgICAgaWYgKCF0b2dnbGVPbkNsaWNrICYmICFpc0luVHJpYW5nbGUpIHsKKyAgICAg ICAgaWYgKGVsZW1lbnQudHJlZUVsZW1lbnQub25jbGljaykKKyAgICAgICAgICAgIGVsZW1lbnQu dHJlZUVsZW1lbnQub25jbGljayhldmVudCk7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAg ICBpZiAoZWxlbWVudC50cmVlRWxlbWVudC5leHBhbmRlZCkgewogICAgICAgICBpZiAoZXZlbnQu YWx0S2V5KQpAQCAtNjkyLDcgKzY5NSw3IEBAIFRyZWVFbGVtZW50LnRyZWVFbGVtZW50RG91Ymxl Q2xpY2tlZCA9IGZ1bmN0aW9uKGV2ZW50KQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoZWxl bWVudC50cmVlRWxlbWVudC5vbmRibGNsaWNrKQotICAgICAgICBlbGVtZW50LnRyZWVFbGVtZW50 Lm9uZGJsY2xpY2suY2FsbChlbGVtZW50LnRyZWVFbGVtZW50LCBldmVudCk7CisgICAgICAgIGVs ZW1lbnQudHJlZUVsZW1lbnQub25kYmxjbGljayhldmVudCk7CiAgICAgZWxzZSBpZiAoZWxlbWVu dC50cmVlRWxlbWVudC5oYXNDaGlsZHJlbiAmJiAhZWxlbWVudC50cmVlRWxlbWVudC5leHBhbmRl ZCkKICAgICAgICAgZWxlbWVudC50cmVlRWxlbWVudC5leHBhbmQoKTsKIH0K