74465 2011-12-13 17:05:03 -0800 Give a resize handle for sidebyside diffs. 2011-12-14 10:35:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth eric rniwa oldest_to_newest 520498 0 ojan 2011-12-13 17:05:03 -0800 Give a resize handle for sidebyside diffs. 520501 1 119113 ojan 2011-12-13 17:06:56 -0800 Created attachment 119113 Patch 520512 2 119113 rniwa 2011-12-13 17:17:30 -0800 Comment on attachment 119113 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119113&action=review jQuery provides drag & drop support. Why are we not using it? > Websites/bugs.webkit.org/code-review.js:67 > + var minLeftSideWidth = 10; > + var maxLeftSideWidth = 90; I'd rename them to something like minLeftSideRatio to signify the fact these are percent values. > Websites/bugs.webkit.org/code-review.js:1728 > + function generateFileDiffResizeStyleElement() { > + // FIXME: Once we support calc, we can replace this with something that uses the attribute value. Really? We can't use CSSOM to generate style rules? > Websites/bugs.webkit.org/code-review.js:1734 > + 'left: ' + i + '%' + Can we make this a function? e.g. cssValueWithPercent(name, value) { return value + ': ' + value + '%;' } > Websites/bugs.webkit.org/code-review.js:1750 > + $(document).bind('mousemove', function(e) { I don't see why we don't want to spell out element. > Websites/bugs.webkit.org/code-review.js:1751 > + if (file_diff_being_resized) { Can we do early exit instead? 520577 3 119113 ojan 2011-12-13 18:31:01 -0800 Comment on attachment 119113 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119113&action=review >> Websites/bugs.webkit.org/code-review.js:1728 >> + // FIXME: Once we support calc, we can replace this with something that uses the attribute value. > > Really? We can't use CSSOM to generate style rules? We could, but it would be considerably more verbose and less readable without any significant benefits. >> Websites/bugs.webkit.org/code-review.js:1734 >> + 'left: ' + i + '%' + > > Can we make this a function? e.g. > cssValueWithPercent(name, value) { return value + ': ' + value + '%;' } Could. It doesn't really seem worth the added complexity though. As it is, it's very clear what's going on. 520578 4 119131 ojan 2011-12-13 18:31:19 -0800 Created attachment 119131 Patch 520581 5 ojan 2011-12-13 18:33:19 -0800 (In reply to comment #2) > jQuery provides drag & drop support. Why are we not using it? As best I can tell, It's not built for something like this. It's built for dragging absolutely positioned elements around. 521051 6 ojan 2011-12-14 10:35:48 -0800 Committed r102796: <http://trac.webkit.org/changeset/102796> 119113 2011-12-13 17:06:56 -0800 2011-12-13 18:31:16 -0800 Patch bug-74465-20111213170655.patch text/plain 5148 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzE5CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBiZWY4N2EwZmIxOGQxOWY0ZmM5YjU2YjBkZmFjMzUzYTgzZWRiYmNhLi5hYjQyNTc0YTIy MWE2YTkyYTlhY2JjNjI4OGIzZTMwYWI2MjI0OTQyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdz LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxMS0xMi0xMyAgT2phbiBWYWZhaSAgPG9qYW5AY2hy b21pdW0ub3JnPgogCisgICAgICAgIEdpdmUgYSByZXNpemUgaGFuZGxlIGZvciBzaWRlYnlzaWRl IGRpZmZzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzQ0NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGdpdmVzIGEgZHJhZyBoYW5kbGUgc28geW91IGNhbiBtYWtlIHRoZSBzaWRlLWJ5LXNpZGUK KyAgICAgICAgZGlmZiBub3QgYmUgNTAvNTAgb24gYSBwZXItZmlsZS1kaWZmIGJhc2lzLiBUaGlz IGlzIHVzZWZ1bAorICAgICAgICBmb3IgY2FzZXMgbGlrZSBuZXcgZmlsZXMgd2hlcmUgdGhlcmUn cyBubyB2YWx1ZSBvbiB0aGUKKyAgICAgICAgbGVmdCBzaWRlLgorCisgICAgICAgICogUHJldHR5 UGF0Y2gvUHJldHR5UGF0Y2gucmI6CisgICAgICAgICogY29kZS1yZXZpZXcuanM6CisKKzIwMTEt MTItMTMgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBFeHBhbmRp bmcgY29udGV4dCBpcyBicm9rZW4gZm9yIHByZXBhcmUtQ2hhbmdlTG9nIGluIHRoZSBjb2RlIHJl dmlldyB0b29sLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzQ0NTgKIApkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBh dGNoL1ByZXR0eVBhdGNoLnJiIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNo L1ByZXR0eVBhdGNoLnJiCmluZGV4IGJlM2ViNjU2MTBiOGNjOTI3NDYxZjIxZGVlYmJhZmQ0Zjg2 ODU2YWEuLjI5YmJiYjc2MWU0MTZkN2E5MTdjZjQ4N2U1MzdlYzYwZGJmMTEzYmQgMTAwNjQ0Ci0t LSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgor KysgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIK QEAgLTE0MSw2ICsxNDEsNyBAQCBwcml2YXRlCiAgICAgYm9yZGVyOiAxcHggc29saWQgI2RkZDsK ICAgICBmb250LWZhbWlseTogbW9ub3NwYWNlOwogICAgIG1hcmdpbjogMWVtIDA7CisgICAgcG9z aXRpb246IHJlbGF0aXZlOwogfQogCiBoMSB7CkBAIC0xODcsMTggKzE4OCwyOCBAQCBoMSA6aG92 ZXIgewogICAgIGZsb2F0OiByaWdodDsKIH0KIAotLkxpbmVTaWRlOmxhc3QtY2hpbGQgewotICAg IGZsb2F0OiByaWdodDsKLX0KLQogLkxpbmVTaWRlLAogLnNpZGVieXNpZGUgLkRpZmZCbG9ja1Bh cnQucmVtb3ZlLAogLnNpZGVieXNpZGUgLkRpZmZCbG9ja1BhcnQuYWRkIHsKICAgICBkaXNwbGF5 OmlubGluZS1ibG9jazsKLSAgICB3aWR0aDo1MCU7CisgICAgd2lkdGg6IDUwJTsKICAgICB2ZXJ0 aWNhbC1hbGlnbjogdG9wOwogfQogCisuc2lkZWJ5c2lkZSAucmVzaXplSGFuZGxlIHsKKyAgICB3 aWR0aDogNXB4OworICAgIGhlaWdodDogMTAwJTsKKyAgICBjdXJzb3I6IG1vdmU7CisgICAgcG9z aXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAgICBsZWZ0OiA1MCU7Cit9CisKKy5zaWRl YnlzaWRlIC5yZXNpemVIYW5kbGU6aG92ZXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZXk7 CisgICAgb3BhY2l0eTogMC41OworfQorCiAuc2lkZWJ5c2lkZSAuRGlmZkJsb2NrUGFydC5yZW1v dmUgLnRvLAogLnNpZGVieXNpZGUgLkRpZmZCbG9ja1BhcnQuYWRkIC5mcm9tIHsKICAgICBkaXNw bGF5OiBub25lOwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL2NvZGUtcmV2 aWV3LmpzIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL2NvZGUtcmV2aWV3LmpzCmluZGV4IDE0 MzIyZjNjYjY1NTY3YzMzNjdmYzAyMDIwYTRjNTQzNzY5MGRlYTAuLjE1ZGE5ODJhNWMyZGFiZTM5 YmQ4M2ZhNGVkMzIxYzViNzYzNGZhOGQgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0 Lm9yZy9jb2RlLXJldmlldy5qcworKysgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvY29kZS1y ZXZpZXcuanMKQEAgLTYzLDYgKzYzLDkgQEAgdmFyIENPREVfUkVWSUVXX1VOSVRURVNUOwogICBp ZiAoIWF0dGFjaG1lbnRfaWQpCiAgICAgY29uc29sZS5sb2coJ05vIGF0dGFjaG1lbnQgSUQnKTsK IAorICB2YXIgbWluTGVmdFNpZGVXaWR0aCA9IDEwOworICB2YXIgbWF4TGVmdFNpZGVXaWR0aCA9 IDkwOworICB2YXIgZmlsZV9kaWZmX2JlaW5nX3Jlc2l6ZWQgPSBudWxsOwogICB2YXIgbmV4dF9s aW5lX2lkID0gMDsKICAgdmFyIGZpbGVzID0ge307CiAgIHZhciBvcmlnaW5hbF9maWxlX2NvbnRl bnRzID0ge307CkBAIC0xMTM5LDYgKzExNDIsNyBAQCB2YXIgQ09ERV9SRVZJRVdfVU5JVFRFU1Q7 CiAKICAgICB1cGRhdGVUb29sYmFyQW5jaG9yU3RhdGUoKTsKICAgICBsb2FkRGlmZlN0YXRlKCk7 CisgICAgZ2VuZXJhdGVGaWxlRGlmZlJlc2l6ZVN0eWxlRWxlbWVudCgpOwogICB9OwogCiAgIGZ1 bmN0aW9uIGhhbmRsZVJldmlld0Zvcm1Mb2FkKCkgewpAQCAtMTIyMyw2ICsxMjI3LDkgQEAgdmFy IENPREVfUkVWSUVXX1VOSVRURVNUOwogICAgIGlmIChkaWZmU3RhdGUoZmlsZV9kaWZmKSA9PSBk aWZmX3R5cGUpCiAgICAgICByZXR1cm47CiAKKyAgICBpZiAoISQoJy5yZXNpemVIYW5kbGUnLCBm aWxlX2RpZmYpLmxlbmd0aCkKKyAgICAgICQoZmlsZV9kaWZmKS5hcHBlbmQoJzxkaXYgY2xhc3M9 InJlc2l6ZUhhbmRsZSI+PC9kaXY+Jyk7CisKICAgICAkKGZpbGVfZGlmZikucmVtb3ZlQ2xhc3Mo J3NpZGVieXNpZGUgdW5pZmllZCcpOwogICAgICQoZmlsZV9kaWZmKS5hZGRDbGFzcyhkaWZmX3R5 cGUpOwogCkBAIC0xNzEzLDcgKzE3MjAsNTAgQEAgdmFyIENPREVfUkVWSUVXX1VOSVRURVNUOwog ICAgIHJldHVybiBsaW5lT2Zmc2V0RnJvbShsaW5lLCAxKTsKICAgfQogCi0gICQoZG9jdW1lbnQu Ym9keSkuYmluZCgnbW91c2V1cCcsIHByb2Nlc3NTZWxlY3RlZExpbmVzKTsKKyAgJCgnLnJlc2l6 ZUhhbmRsZScpLmxpdmUoJ21vdXNlZG93bicsIGZ1bmN0aW9uKGUpIHsKKyAgICBmaWxlX2RpZmZf YmVpbmdfcmVzaXplZCA9ICQodGhpcykucGFyZW50KCcuRmlsZURpZmYnKTsKKyAgfSk7CisKKyAg ZnVuY3Rpb24gZ2VuZXJhdGVGaWxlRGlmZlJlc2l6ZVN0eWxlRWxlbWVudCgpIHsKKyAgICAvLyBG SVhNRTogT25jZSB3ZSBzdXBwb3J0IGNhbGMsIHdlIGNhbiByZXBsYWNlIHRoaXMgd2l0aCBzb21l dGhpbmcgdGhhdCB1c2VzIHRoZSBhdHRyaWJ1dGUgdmFsdWUuCisgICAgdmFyIHN0eWxlVGV4dCA9 ICcnOworICAgIGZvciAodmFyIGkgPSBtaW5MZWZ0U2lkZVdpZHRoOyBpIDw9IG1heExlZnRTaWRl V2lkdGg7IGkrKykgeworICAgICAgLy8gRklYTUU6IE9uY2Ugd2Ugc3VwcG9ydCBjYWxjLCBwdXQg dGhlIHJlc2l6ZSBoYW5kbGUgYXQgY2FsYyhpJSAtIDUpIHNvIGl0IGRvZXNuJ3QgY292ZXIgdXAK KyAgICAgIC8vIHRoZSByaWdodC1zaWRlIGxpbmUgbnVtYmVycy4KKyAgICAgIHN0eWxlVGV4dCAr PSAnLkZpbGVEaWZmW2xlZnRzaWRld2lkdGg9IicgKyBpICsgJyJdIC5yZXNpemVIYW5kbGUgeycg KworICAgICAgICAnbGVmdDogJyArIGkgKyAnJScgKworICAgICAgJ30nICsKKyAgICAgICcuRmls ZURpZmZbbGVmdHNpZGV3aWR0aD0iJyArIGkgKyAnIl0gLkxpbmVTaWRlOmZpcnN0LWNoaWxkLCcg KworICAgICAgJy5GaWxlRGlmZltsZWZ0c2lkZXdpZHRoPSInICsgaSArICciXS5zaWRlYnlzaWRl IC5EaWZmQmxvY2tQYXJ0LnJlbW92ZSB7JyArCisgICAgICAgICd3aWR0aDonICsgaSArICclOycg KworICAgICAgJ30nICsKKyAgICAgICcuRmlsZURpZmZbbGVmdHNpZGV3aWR0aD0iJyArIGkgKyAn Il0gLkxpbmVTaWRlOmxhc3QtY2hpbGQsJyArCisgICAgICAnLkZpbGVEaWZmW2xlZnRzaWRld2lk dGg9IicgKyBpICsgJyJdLnNpZGVieXNpZGUgLkRpZmZCbG9ja1BhcnQuYWRkIHsnICsKKyAgICAg ICAgJ3dpZHRoOicgKyAoMTAwIC0gaSkgKyAnJTsnICsKKyAgICAgICd9JzsKKyAgICB9CisgICAg dmFyIHN0eWxlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3N0eWxlJyk7CisgICAg c3R5bGVFbGVtZW50LmlubmVyVGV4dCA9IHN0eWxlVGV4dDsKKyAgICBkb2N1bWVudC5oZWFkLmFw cGVuZENoaWxkKHN0eWxlRWxlbWVudCk7CisgIH0KKworICAkKGRvY3VtZW50KS5iaW5kKCdtb3Vz ZW1vdmUnLCBmdW5jdGlvbihlKSB7CisgICAgaWYgKGZpbGVfZGlmZl9iZWluZ19yZXNpemVkKSB7 CisgICAgICB2YXIgcmF0aW8gPSBlLnBhZ2VYIC8gd2luZG93LmlubmVyV2lkdGg7CisgICAgICB2 YXIgcGVyY2VudGFnZSA9IE1hdGguZmxvb3IocmF0aW8gKiAxMDApOworICAgICAgaWYgKHBlcmNl bnRhZ2UgPCBtaW5MZWZ0U2lkZVdpZHRoKQorICAgICAgICBwZXJjZW50YWdlID0gbWluTGVmdFNp ZGVXaWR0aDsKKyAgICAgIGlmIChwZXJjZW50YWdlID4gbWF4TGVmdFNpZGVXaWR0aCkKKyAgICAg ICAgcGVyY2VudGFnZSA9IG1heExlZnRTaWRlV2lkdGg7CisgICAgICBmaWxlX2RpZmZfYmVpbmdf cmVzaXplZC5hdHRyKCdsZWZ0c2lkZXdpZHRoJywgcGVyY2VudGFnZSk7CisgICAgICBlLnByZXZl bnREZWZhdWx0KCk7CisgICAgfQorICB9KTsKKworICAkKGRvY3VtZW50KS5iaW5kKCdtb3VzZXVw JywgZnVuY3Rpb24oZSkgeworICAgIGZpbGVfZGlmZl9iZWluZ19yZXNpemVkID0gbnVsbDsKKyAg ICBwcm9jZXNzU2VsZWN0ZWRMaW5lcygpOworICB9KTsKIAogICAkKCcubGluZU51bWJlcicpLmxp dmUoJ2NsaWNrJywgZnVuY3Rpb24oZSkgewogICAgIHZhciBsaW5lID0gbGluZUZyb21MaW5lRGVz Y2VuZGFudCgkKHRoaXMpKTsK 119131 2011-12-13 18:31:19 -0800 2011-12-13 19:24:36 -0800 Patch bug-74465-20111213183118.patch text/plain 5161 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzE5CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBiZWY4N2EwZmIxOGQxOWY0ZmM5YjU2YjBkZmFjMzUzYTgzZWRiYmNhLi5hYjQyNTc0YTIy MWE2YTkyYTlhY2JjNjI4OGIzZTMwYWI2MjI0OTQyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdz LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxMS0xMi0xMyAgT2phbiBWYWZhaSAgPG9qYW5AY2hy b21pdW0ub3JnPgogCisgICAgICAgIEdpdmUgYSByZXNpemUgaGFuZGxlIGZvciBzaWRlYnlzaWRl IGRpZmZzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzQ0NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGdpdmVzIGEgZHJhZyBoYW5kbGUgc28geW91IGNhbiBtYWtlIHRoZSBzaWRlLWJ5LXNpZGUK KyAgICAgICAgZGlmZiBub3QgYmUgNTAvNTAgb24gYSBwZXItZmlsZS1kaWZmIGJhc2lzLiBUaGlz IGlzIHVzZWZ1bAorICAgICAgICBmb3IgY2FzZXMgbGlrZSBuZXcgZmlsZXMgd2hlcmUgdGhlcmUn cyBubyB2YWx1ZSBvbiB0aGUKKyAgICAgICAgbGVmdCBzaWRlLgorCisgICAgICAgICogUHJldHR5 UGF0Y2gvUHJldHR5UGF0Y2gucmI6CisgICAgICAgICogY29kZS1yZXZpZXcuanM6CisKKzIwMTEt MTItMTMgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBFeHBhbmRp bmcgY29udGV4dCBpcyBicm9rZW4gZm9yIHByZXBhcmUtQ2hhbmdlTG9nIGluIHRoZSBjb2RlIHJl dmlldyB0b29sLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzQ0NTgKIApkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBh dGNoL1ByZXR0eVBhdGNoLnJiIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNo L1ByZXR0eVBhdGNoLnJiCmluZGV4IGJlM2ViNjU2MTBiOGNjOTI3NDYxZjIxZGVlYmJhZmQ0Zjg2 ODU2YWEuLjI5YmJiYjc2MWU0MTZkN2E5MTdjZjQ4N2U1MzdlYzYwZGJmMTEzYmQgMTAwNjQ0Ci0t LSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgor KysgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIK QEAgLTE0MSw2ICsxNDEsNyBAQCBwcml2YXRlCiAgICAgYm9yZGVyOiAxcHggc29saWQgI2RkZDsK ICAgICBmb250LWZhbWlseTogbW9ub3NwYWNlOwogICAgIG1hcmdpbjogMWVtIDA7CisgICAgcG9z aXRpb246IHJlbGF0aXZlOwogfQogCiBoMSB7CkBAIC0xODcsMTggKzE4OCwyOCBAQCBoMSA6aG92 ZXIgewogICAgIGZsb2F0OiByaWdodDsKIH0KIAotLkxpbmVTaWRlOmxhc3QtY2hpbGQgewotICAg IGZsb2F0OiByaWdodDsKLX0KLQogLkxpbmVTaWRlLAogLnNpZGVieXNpZGUgLkRpZmZCbG9ja1Bh cnQucmVtb3ZlLAogLnNpZGVieXNpZGUgLkRpZmZCbG9ja1BhcnQuYWRkIHsKICAgICBkaXNwbGF5 OmlubGluZS1ibG9jazsKLSAgICB3aWR0aDo1MCU7CisgICAgd2lkdGg6IDUwJTsKICAgICB2ZXJ0 aWNhbC1hbGlnbjogdG9wOwogfQogCisuc2lkZWJ5c2lkZSAucmVzaXplSGFuZGxlIHsKKyAgICB3 aWR0aDogNXB4OworICAgIGhlaWdodDogMTAwJTsKKyAgICBjdXJzb3I6IG1vdmU7CisgICAgcG9z aXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAgICBsZWZ0OiA1MCU7Cit9CisKKy5zaWRl YnlzaWRlIC5yZXNpemVIYW5kbGU6aG92ZXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZXk7 CisgICAgb3BhY2l0eTogMC41OworfQorCiAuc2lkZWJ5c2lkZSAuRGlmZkJsb2NrUGFydC5yZW1v dmUgLnRvLAogLnNpZGVieXNpZGUgLkRpZmZCbG9ja1BhcnQuYWRkIC5mcm9tIHsKICAgICBkaXNw bGF5OiBub25lOwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL2NvZGUtcmV2 aWV3LmpzIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL2NvZGUtcmV2aWV3LmpzCmluZGV4IDE0 MzIyZjNjYjY1NTY3YzMzNjdmYzAyMDIwYTRjNTQzNzY5MGRlYTAuLjgyNGMxNTA5YWYxNTYzNThj YmVlMDQyYmU2NWY4MmYzYTE4ZDViNjQgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0 Lm9yZy9jb2RlLXJldmlldy5qcworKysgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvY29kZS1y ZXZpZXcuanMKQEAgLTYzLDYgKzYzLDkgQEAgdmFyIENPREVfUkVWSUVXX1VOSVRURVNUOwogICBp ZiAoIWF0dGFjaG1lbnRfaWQpCiAgICAgY29uc29sZS5sb2coJ05vIGF0dGFjaG1lbnQgSUQnKTsK IAorICB2YXIgbWluTGVmdFNpZGVSYXRpbyA9IDEwOworICB2YXIgbWF4TGVmdFNpZGVSYXRpbyA9 IDkwOworICB2YXIgZmlsZV9kaWZmX2JlaW5nX3Jlc2l6ZWQgPSBudWxsOwogICB2YXIgbmV4dF9s aW5lX2lkID0gMDsKICAgdmFyIGZpbGVzID0ge307CiAgIHZhciBvcmlnaW5hbF9maWxlX2NvbnRl bnRzID0ge307CkBAIC0xMTM5LDYgKzExNDIsNyBAQCB2YXIgQ09ERV9SRVZJRVdfVU5JVFRFU1Q7 CiAKICAgICB1cGRhdGVUb29sYmFyQW5jaG9yU3RhdGUoKTsKICAgICBsb2FkRGlmZlN0YXRlKCk7 CisgICAgZ2VuZXJhdGVGaWxlRGlmZlJlc2l6ZVN0eWxlRWxlbWVudCgpOwogICB9OwogCiAgIGZ1 bmN0aW9uIGhhbmRsZVJldmlld0Zvcm1Mb2FkKCkgewpAQCAtMTIyMyw2ICsxMjI3LDkgQEAgdmFy IENPREVfUkVWSUVXX1VOSVRURVNUOwogICAgIGlmIChkaWZmU3RhdGUoZmlsZV9kaWZmKSA9PSBk aWZmX3R5cGUpCiAgICAgICByZXR1cm47CiAKKyAgICBpZiAoISQoJy5yZXNpemVIYW5kbGUnLCBm aWxlX2RpZmYpLmxlbmd0aCkKKyAgICAgICQoZmlsZV9kaWZmKS5hcHBlbmQoJzxkaXYgY2xhc3M9 InJlc2l6ZUhhbmRsZSI+PC9kaXY+Jyk7CisKICAgICAkKGZpbGVfZGlmZikucmVtb3ZlQ2xhc3Mo J3NpZGVieXNpZGUgdW5pZmllZCcpOwogICAgICQoZmlsZV9kaWZmKS5hZGRDbGFzcyhkaWZmX3R5 cGUpOwogCkBAIC0xNzEzLDcgKzE3MjAsNTEgQEAgdmFyIENPREVfUkVWSUVXX1VOSVRURVNUOwog ICAgIHJldHVybiBsaW5lT2Zmc2V0RnJvbShsaW5lLCAxKTsKICAgfQogCi0gICQoZG9jdW1lbnQu Ym9keSkuYmluZCgnbW91c2V1cCcsIHByb2Nlc3NTZWxlY3RlZExpbmVzKTsKKyAgJCgnLnJlc2l6 ZUhhbmRsZScpLmxpdmUoJ21vdXNlZG93bicsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgZmlsZV9k aWZmX2JlaW5nX3Jlc2l6ZWQgPSAkKHRoaXMpLnBhcmVudCgnLkZpbGVEaWZmJyk7CisgIH0pOwor CisgIGZ1bmN0aW9uIGdlbmVyYXRlRmlsZURpZmZSZXNpemVTdHlsZUVsZW1lbnQoKSB7CisgICAg Ly8gRklYTUU6IE9uY2Ugd2Ugc3VwcG9ydCBjYWxjLCB3ZSBjYW4gcmVwbGFjZSB0aGlzIHdpdGgg c29tZXRoaW5nIHRoYXQgdXNlcyB0aGUgYXR0cmlidXRlIHZhbHVlLgorICAgIHZhciBzdHlsZVRl eHQgPSAnJzsKKyAgICBmb3IgKHZhciBpID0gbWluTGVmdFNpZGVSYXRpbzsgaSA8PSBtYXhMZWZ0 U2lkZVJhdGlvOyBpKyspIHsKKyAgICAgIC8vIEZJWE1FOiBPbmNlIHdlIHN1cHBvcnQgY2FsYywg cHV0IHRoZSByZXNpemUgaGFuZGxlIGF0IGNhbGMoaSUgLSA1KSBzbyBpdCBkb2Vzbid0IGNvdmVy IHVwCisgICAgICAvLyB0aGUgcmlnaHQtc2lkZSBsaW5lIG51bWJlcnMuCisgICAgICBzdHlsZVRl eHQgKz0gJy5GaWxlRGlmZltsZWZ0c2lkZXdpZHRoPSInICsgaSArICciXSAucmVzaXplSGFuZGxl IHsnICsKKyAgICAgICAgJ2xlZnQ6ICcgKyBpICsgJyUnICsKKyAgICAgICd9JyArCisgICAgICAn LkZpbGVEaWZmW2xlZnRzaWRld2lkdGg9IicgKyBpICsgJyJdIC5MaW5lU2lkZTpmaXJzdC1jaGls ZCwnICsKKyAgICAgICcuRmlsZURpZmZbbGVmdHNpZGV3aWR0aD0iJyArIGkgKyAnIl0uc2lkZWJ5 c2lkZSAuRGlmZkJsb2NrUGFydC5yZW1vdmUgeycgKworICAgICAgICAnd2lkdGg6JyArIGkgKyAn JTsnICsKKyAgICAgICd9JyArCisgICAgICAnLkZpbGVEaWZmW2xlZnRzaWRld2lkdGg9IicgKyBp ICsgJyJdIC5MaW5lU2lkZTpsYXN0LWNoaWxkLCcgKworICAgICAgJy5GaWxlRGlmZltsZWZ0c2lk ZXdpZHRoPSInICsgaSArICciXS5zaWRlYnlzaWRlIC5EaWZmQmxvY2tQYXJ0LmFkZCB7JyArCisg ICAgICAgICd3aWR0aDonICsgKDEwMCAtIGkpICsgJyU7JyArCisgICAgICAnfSc7CisgICAgfQor ICAgIHZhciBzdHlsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdzdHlsZScpOwor ICAgIHN0eWxlRWxlbWVudC5pbm5lclRleHQgPSBzdHlsZVRleHQ7CisgICAgZG9jdW1lbnQuaGVh ZC5hcHBlbmRDaGlsZChzdHlsZUVsZW1lbnQpOworICB9CisKKyAgJChkb2N1bWVudCkuYmluZCgn bW91c2Vtb3ZlJywgZnVuY3Rpb24oZXZlbnQpIHsKKyAgICBpZiAoIWZpbGVfZGlmZl9iZWluZ19y ZXNpemVkKQorICAgICAgcmV0dXJuOworCisgICAgdmFyIHJhdGlvID0gZXZlbnQucGFnZVggLyB3 aW5kb3cuaW5uZXJXaWR0aDsKKyAgICB2YXIgcGVyY2VudGFnZSA9IE1hdGguZmxvb3IocmF0aW8g KiAxMDApOworICAgIGlmIChwZXJjZW50YWdlIDwgbWluTGVmdFNpZGVSYXRpbykKKyAgICAgIHBl cmNlbnRhZ2UgPSBtaW5MZWZ0U2lkZVJhdGlvOworICAgIGlmIChwZXJjZW50YWdlID4gbWF4TGVm dFNpZGVSYXRpbykKKyAgICAgIHBlcmNlbnRhZ2UgPSBtYXhMZWZ0U2lkZVJhdGlvOworICAgIGZp bGVfZGlmZl9iZWluZ19yZXNpemVkLmF0dHIoJ2xlZnRzaWRld2lkdGgnLCBwZXJjZW50YWdlKTsK KyAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICB9KTsKKworICAkKGRvY3VtZW50KS5iaW5k KCdtb3VzZXVwJywgZnVuY3Rpb24oZXZlbnQpIHsKKyAgICBmaWxlX2RpZmZfYmVpbmdfcmVzaXpl ZCA9IG51bGw7CisgICAgcHJvY2Vzc1NlbGVjdGVkTGluZXMoKTsKKyAgfSk7CiAKICAgJCgnLmxp bmVOdW1iZXInKS5saXZlKCdjbGljaycsIGZ1bmN0aW9uKGUpIHsKICAgICB2YXIgbGluZSA9IGxp bmVGcm9tTGluZURlc2NlbmRhbnQoJCh0aGlzKSk7Cg==