26950 BugzillaSummaryEdit 2009-07-03 00:59:31 -0700 Make the summary and alias fields support click-to-edit 2009-07-03 17:22:23 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED https://bugzilla.mozilla.org/show_bug.cgi?id=502249 P2 Normal --- 17457 1 mjs mjs ddkilzer oldest_to_newest 129681 0 mjs 2009-07-03 00:59:31 -0700 Make the summary and alias fields support click-to-edit, so Bugzilla can be cool like Flickr. 129682 1 32224 mjs 2009-07-03 01:01:22 -0700 Created attachment 32224 patch 129683 2 mjs 2009-07-03 01:01:59 -0700 My patch is completely untested - I could not figure out how to set up a bugzilla test server to try it out. 129685 3 32225 mjs 2009-07-03 01:19:35 -0700 Created attachment 32225 patch 129719 4 32225 ddkilzer 2009-07-03 10:20:43 -0700 Comment on attachment 32225 patch >-function hideEditableField( container, input, action, field_id, original_value ) { >+function hideEditableField( container, input, action, field1_text, field2_text, field_id, original_value ) { > YAHOO.util.Dom.setStyle(container, 'display', 'inline'); > YAHOO.util.Dom.setStyle(input, 'display', 'none'); >- YAHOO.util.Event.addListener(action, 'click', showEditableField, >+ YAHOO.util.Event.addListener(action, 'click', showEditableFieldFocusLast, >+ new Array(container, input)); >+ YAHOO.util.Event.addListener(field2_text, 'click', showEditableFieldFocusLast, >+ new Array(container, input)); >+ YAHOO.util.Event.addListener(field1_text, 'click', showEditableField, > new Array(container, input)); Since field2_text is field_id with "_nonedit_display" appended and field1_text is "alias_nonedit_display", I don't think you need to add two parameters here. Also, adding a new function, showEditableFieldFocusLast(), instead of adding arguments to the array object goes against the design of the JavaScript used elsewhere in the file. >-function showEditableField (e, ContainerInputArray) { >+function showEditableField (e, ContainerInputArray, focusLast) { The "focusLast" argument should be passed in with the ContainerInputArray argument. > } >+ >+ > YAHOO.util.Event.preventDefault(e); > } Gratuitous whitespace change. >+function showEditableFieldFocusLast (e, ContainerInputArray) { >+ showEditableField(e, ContainerInputArray, true); >+} This function won't be needed if you add the "focusLast" argument to the ContainerInputArray. > hideEditableField( 'summary_alias_container','summary_alias_input', >- 'editme_action','short_desc', short_desc_value); >+ 'editme_action', 'alias_nonedit_display', 'short_desc_nonedit_display', 'short_desc', short_desc_value); Again, I think we only need to add one argument to hideEditableField(). r- for the above issues. (Patches to Bugzilla should try to match the existing design to make them easier to merge upstream.) FWIW, this patch did work using a local copy of the original page (saved as HTML) with a <base> tag added and the URL to the field.js adjusted to use a local copy. I have an updated patch that I'll post next. 129720 5 32240 ddkilzer 2009-07-03 10:23:01 -0700 Created attachment 32240 Patch v3 Patch with issues in Comment #4 addressed. 129726 6 ddkilzer 2009-07-03 10:34:57 -0700 Filed a Bugzilla bug for this enhancement request: Bug 502249: Make the short description and alias fields support click-to-edit <https://bugzilla.mozilla.org/show_bug.cgi?id=502249> 129745 7 32240 mjs 2009-07-03 14:02:56 -0700 Comment on attachment 32240 Patch v3 r=me on your changes. Not sure which one of us should land the patch now. :-) 129751 8 ddkilzer 2009-07-03 16:43:03 -0700 (In reply to comment #7) > (From update of attachment 32240 [details]) > r=me on your changes. Not sure which one of us should land the patch now. :-) I got it. :) 129755 9 ddkilzer 2009-07-03 17:21:24 -0700 $ git svn dcommit Committing to http://svn.webkit.org/repository/webkit/trunk ... M BugsSite/ChangeLog M BugsSite/js/field.js Committed r45538 http://trac.webkit.org/changeset/45538 32224 2009-07-03 01:01:22 -0700 2009-07-03 01:19:29 -0700 patch bugzilla_requires_a_filename.patch text/plain 3884 mjs SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQ1NTMw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDct MDMgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIE1ha2UgdGhlIHN1bW1hcnkgYW5kIGFs aWFzIGZpZWxkcyBzdXBwb3J0IGNsaWNrLXRvLWVkaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2OTUwCisgICAgICAgIAorICAgICAgICAqIGpzL2Zp ZWxkLmpzOgorICAgICAgICAoaGlkZUVkaXRhYmxlRmllbGQpOgorICAgICAgICAoc2hvd0VkaXRh YmxlRmllbGQpOgorICAgICAgICAoc2hvd0VkaXRhYmxlRmllbGRGb2N1c0xhc3QpOgorICAgICAg ICAoaGlkZUFsaWFzQW5kU3VtbWFyeSk6CisKIDIwMDktMDctMDIgIERhdmlkIEQuIEtpbHplciAg PGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBDb25maWcgZmlsZSBmb3IgY29udHJpYi9y ZWNvZGUucGwgd2hlbiB1cGdyYWRpbmcgYnVncy53ZWJraXQub3JnCkluZGV4OiBqcy9maWVsZC5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBqcy9maWVsZC5qcwkocmV2aXNpb24gNDU1MjgpCisrKyBqcy9maWVs ZC5qcwkod29ya2luZyBjb3B5KQpAQCAtMTM4LDEwICsxMzgsMTQgQEAgZnVuY3Rpb24gdXBkYXRl Q2FsZW5kYXJGcm9tRmllbGQoZGF0ZV9maQogCiAKIC8qIEhpZGUgaW5wdXQgZmllbGRzIGFuZCBz aG93IHRoZSB0ZXh0IHdpdGggKGVkaXQpIG5leHQgdG8gaXQgKi8gIAotZnVuY3Rpb24gaGlkZUVk aXRhYmxlRmllbGQoIGNvbnRhaW5lciwgaW5wdXQsIGFjdGlvbiwgZmllbGRfaWQsIG9yaWdpbmFs X3ZhbHVlICkgeworZnVuY3Rpb24gaGlkZUVkaXRhYmxlRmllbGQoIGNvbnRhaW5lciwgaW5wdXQs IGFjdGlvbiwgZmllbGQxX3RleHQsIGZpZWxkMl90ZXh0LCBmaWVsZF9pZCwgb3JpZ2luYWxfdmFs dWUgKSB7CiAgICAgWUFIT08udXRpbC5Eb20uc2V0U3R5bGUoY29udGFpbmVyLCAnZGlzcGxheScs ICdpbmxpbmUnKTsKICAgICBZQUhPTy51dGlsLkRvbS5zZXRTdHlsZShpbnB1dCwgJ2Rpc3BsYXkn LCAnbm9uZScpOwotICAgIFlBSE9PLnV0aWwuRXZlbnQuYWRkTGlzdGVuZXIoYWN0aW9uLCAnY2xp Y2snLCBzaG93RWRpdGFibGVGaWVsZCwKKyAgICBZQUhPTy51dGlsLkV2ZW50LmFkZExpc3RlbmVy KGFjdGlvbiwgJ2NsaWNrJywgc2hvd0VkaXRhYmxlRmllbGRGb2N1c0xhc3QsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBuZXcgQXJyYXkoY29udGFpbmVyLCBpbnB1dCkpOworICAg IFlBSE9PLnV0aWwuRXZlbnQuYWRkTGlzdGVuZXIoZmllbGQyX3RleHQsICdjbGljaycsIHNob3dF ZGl0YWJsZUZpZWxkRm9jdXNMYXN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bmV3IEFycmF5KGNvbnRhaW5lciwgaW5wdXQpKTsKKyAgICBZQUhPTy51dGlsLkV2ZW50LmFkZExp c3RlbmVyKGZpZWxkMV90ZXh0LCAnY2xpY2snLCBzaG93RWRpdGFibGVGaWVsZCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBBcnJheShjb250YWluZXIsIGlucHV0KSk7CiAg ICAgaWYoZmllbGRfaWQgIT0gIiIpewogICAgICAgICBZQUhPTy51dGlsLkV2ZW50LmFkZExpc3Rl bmVyKHdpbmRvdywgJ2xvYWQnLCBjaGVja0ZvckNoYW5nZWRGaWVsZFZhbHVlcywKQEAgLTE1OCw3 ICsxNjIsNyBAQCBmdW5jdGlvbiBoaWRlRWRpdGFibGVGaWVsZCggY29udGFpbmVyLCBpCiAgKiB2 YXIgQ29udGFpbmVySW5wdXRBcnJheVsxXTogdGhlIGlucHV0IGFyZWEgYW5kIGxhYmVsIHRoYXQg d2lsbCBiZSBkaXNwbGF5ZWQKICAqCiAgKi8KLWZ1bmN0aW9uIHNob3dFZGl0YWJsZUZpZWxkIChl LCBDb250YWluZXJJbnB1dEFycmF5KSB7CitmdW5jdGlvbiBzaG93RWRpdGFibGVGaWVsZCAoZSwg Q29udGFpbmVySW5wdXRBcnJheSwgZm9jdXNMYXN0KSB7CiAgICAgdmFyIGlucHV0cyA9IG5ldyBB cnJheSgpOwogICAgIHZhciBpbnB1dEFyZWEgPSBZQUhPTy51dGlsLkRvbS5nZXQoQ29udGFpbmVy SW5wdXRBcnJheVsxXSk7ICAgIAogICAgIGlmICggISBpbnB1dEFyZWEgKXsKQEAgLTE3MywxMyAr MTc3LDI1IEBAIGZ1bmN0aW9uIHNob3dFZGl0YWJsZUZpZWxkIChlLCBDb250YWluZXIKICAgICAg ICAgaW5wdXRzID0gaW5wdXRBcmVhLmdldEVsZW1lbnRzQnlUYWdOYW1lKCdpbnB1dCcpOwogICAg IH0KICAgICBpZiAoIGlucHV0cy5sZW5ndGggPiAwICkgewotICAgICAgICAvLyBmb2N1cyBvbiB0 aGUgZmlyc3QgZmllbGQsIHRoaXMgbWFrZXMgaXQgZWFzaWVyIHRvIGVkaXQKLSAgICAgICAgaW5w dXRzWzBdLmZvY3VzKCk7Ci0gICAgICAgIGlucHV0c1swXS5zZWxlY3QoKTsKKyAgICAgICAgaWYg KGZvY3VzTGFzdCkgeworICAgICAgICAgICAgLy8gZm9jdXMgb24gdGhlIGxhc3QgZmllbGQsIHNp bmNlIHN1bW1hcnkgaXMgbW9yZSBjb21tb24gdG8gZWRpdCB0aGFuIGFsaWFzCisgICAgICAgICAg ICBpbnB1dHNbaW5wdXRzLmxlbmd0aCAtIDFdLmZvY3VzKCk7CisgICAgICAgICAgICBpbnB1dHNb aW5wdXRzLmxlbmd0aCAtIDFdLnNlbGVjdCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgLy8gZm9jdXMgb24gdGhlIGZpcnN0IGZpZWxkLCB0aGlzIG1ha2VzIGl0IGVhc2llciB0byBl ZGl0CisgICAgICAgICAgICBpbnB1dHNbMF0uZm9jdXMoKTsKKyAgICAgICAgICAgIGlucHV0c1sw XS5zZWxlY3QoKTsKKyAgICAgICAgfQogICAgIH0KKworCiAgICAgWUFIT08udXRpbC5FdmVudC5w cmV2ZW50RGVmYXVsdChlKTsKIH0KIAorZnVuY3Rpb24gc2hvd0VkaXRhYmxlRmllbGRGb2N1c0xh c3QgKGUsIENvbnRhaW5lcklucHV0QXJyYXkpIHsKKyAgICBzaG9lRWRpdGFibGVGaWVsZChlLCBD b250YWluZXJJbnB1dEFycmF5LCB0cnVlKTsKK30KKwogCiAvKiBjaGVja0ZvckNoYW5nZWRGaWVs ZFZhbHVlcyhlLCBhcnJheSApCiAgKiBGdW5jdGlvbiBjaGVja3MgaWYgYWZ0ZXIgdGhlIGF1dG9j b21wbGV0ZSBieSB0aGUgYnJvd3NlciBpZiB0aGUgdmFsdWVzIG1hdGNoIHRoZSBvcmlnaW5hbHMu CkBAIC0yMjEsNyArMjM3LDcgQEAgZnVuY3Rpb24gY2hlY2tGb3JDaGFuZ2VkRmllbGRWYWx1ZXMo ZSwgQwogZnVuY3Rpb24gaGlkZUFsaWFzQW5kU3VtbWFyeShzaG9ydF9kZXNjX3ZhbHVlLCBhbGlh c192YWx1ZSkgewogICAgIC8vIGNoZWNrIHRoZSBzaG9ydCBkZXNjIGZpZWxkCiAgICAgaGlkZUVk aXRhYmxlRmllbGQoICdzdW1tYXJ5X2FsaWFzX2NvbnRhaW5lcicsJ3N1bW1hcnlfYWxpYXNfaW5w dXQnLAotICAgICAgICAgICAgICAgICAgICAgICAnZWRpdG1lX2FjdGlvbicsJ3Nob3J0X2Rlc2Mn LCBzaG9ydF9kZXNjX3ZhbHVlKTsgIAorICAgICAgICAgICAgICAgICAgICAgICAnZWRpdG1lX2Fj dGlvbicsICdhbGlhc19ub25lZGl0X2Rpc3BsYXknLCAnc2hvcnRfZGVzY19ub25lZGl0X2Rpc3Bs YXknLCAnc2hvcnRfZGVzYycsIHNob3J0X2Rlc2NfdmFsdWUpOyAgCiAgICAgLy8gY2hlY2sgdGhh dCB0aGUgYWxpYXMgaGFzbid0IGNoYW5nZWQKICAgICB2YXIgYnpfYWxpYXNfY2hlY2tfYXJyYXkg PSBuZXcgQXJyYXkoJ3N1bW1hcnlfYWxpYXNfY29udGFpbmVyJywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnc3VtbWFyeV9hbGlhc19pbnB1dCcsICdhbGlhcycsIGFsaWFz X3ZhbHVlKTs= 32225 2009-07-03 01:19:35 -0700 2009-07-03 10:23:01 -0700 patch bugzilla_requires_a_filename.patch text/plain 3884 mjs SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQ1NTMw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDct MDMgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIE1ha2UgdGhlIHN1bW1hcnkgYW5kIGFs aWFzIGZpZWxkcyBzdXBwb3J0IGNsaWNrLXRvLWVkaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2OTUwCisgICAgICAgIAorICAgICAgICAqIGpzL2Zp ZWxkLmpzOgorICAgICAgICAoaGlkZUVkaXRhYmxlRmllbGQpOgorICAgICAgICAoc2hvd0VkaXRh YmxlRmllbGQpOgorICAgICAgICAoc2hvd0VkaXRhYmxlRmllbGRGb2N1c0xhc3QpOgorICAgICAg ICAoaGlkZUFsaWFzQW5kU3VtbWFyeSk6CisKIDIwMDktMDctMDIgIERhdmlkIEQuIEtpbHplciAg PGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBDb25maWcgZmlsZSBmb3IgY29udHJpYi9y ZWNvZGUucGwgd2hlbiB1cGdyYWRpbmcgYnVncy53ZWJraXQub3JnCkluZGV4OiBqcy9maWVsZC5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBqcy9maWVsZC5qcwkocmV2aXNpb24gNDU1MjgpCisrKyBqcy9maWVs ZC5qcwkod29ya2luZyBjb3B5KQpAQCAtMTM4LDEwICsxMzgsMTQgQEAgZnVuY3Rpb24gdXBkYXRl Q2FsZW5kYXJGcm9tRmllbGQoZGF0ZV9maQogCiAKIC8qIEhpZGUgaW5wdXQgZmllbGRzIGFuZCBz aG93IHRoZSB0ZXh0IHdpdGggKGVkaXQpIG5leHQgdG8gaXQgKi8gIAotZnVuY3Rpb24gaGlkZUVk aXRhYmxlRmllbGQoIGNvbnRhaW5lciwgaW5wdXQsIGFjdGlvbiwgZmllbGRfaWQsIG9yaWdpbmFs X3ZhbHVlICkgeworZnVuY3Rpb24gaGlkZUVkaXRhYmxlRmllbGQoIGNvbnRhaW5lciwgaW5wdXQs IGFjdGlvbiwgZmllbGQxX3RleHQsIGZpZWxkMl90ZXh0LCBmaWVsZF9pZCwgb3JpZ2luYWxfdmFs dWUgKSB7CiAgICAgWUFIT08udXRpbC5Eb20uc2V0U3R5bGUoY29udGFpbmVyLCAnZGlzcGxheScs ICdpbmxpbmUnKTsKICAgICBZQUhPTy51dGlsLkRvbS5zZXRTdHlsZShpbnB1dCwgJ2Rpc3BsYXkn LCAnbm9uZScpOwotICAgIFlBSE9PLnV0aWwuRXZlbnQuYWRkTGlzdGVuZXIoYWN0aW9uLCAnY2xp Y2snLCBzaG93RWRpdGFibGVGaWVsZCwKKyAgICBZQUhPTy51dGlsLkV2ZW50LmFkZExpc3RlbmVy KGFjdGlvbiwgJ2NsaWNrJywgc2hvd0VkaXRhYmxlRmllbGRGb2N1c0xhc3QsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBuZXcgQXJyYXkoY29udGFpbmVyLCBpbnB1dCkpOworICAg IFlBSE9PLnV0aWwuRXZlbnQuYWRkTGlzdGVuZXIoZmllbGQyX3RleHQsICdjbGljaycsIHNob3dF ZGl0YWJsZUZpZWxkRm9jdXNMYXN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bmV3IEFycmF5KGNvbnRhaW5lciwgaW5wdXQpKTsKKyAgICBZQUhPTy51dGlsLkV2ZW50LmFkZExp c3RlbmVyKGZpZWxkMV90ZXh0LCAnY2xpY2snLCBzaG93RWRpdGFibGVGaWVsZCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBBcnJheShjb250YWluZXIsIGlucHV0KSk7CiAg ICAgaWYoZmllbGRfaWQgIT0gIiIpewogICAgICAgICBZQUhPTy51dGlsLkV2ZW50LmFkZExpc3Rl bmVyKHdpbmRvdywgJ2xvYWQnLCBjaGVja0ZvckNoYW5nZWRGaWVsZFZhbHVlcywKQEAgLTE1OCw3 ICsxNjIsNyBAQCBmdW5jdGlvbiBoaWRlRWRpdGFibGVGaWVsZCggY29udGFpbmVyLCBpCiAgKiB2 YXIgQ29udGFpbmVySW5wdXRBcnJheVsxXTogdGhlIGlucHV0IGFyZWEgYW5kIGxhYmVsIHRoYXQg d2lsbCBiZSBkaXNwbGF5ZWQKICAqCiAgKi8KLWZ1bmN0aW9uIHNob3dFZGl0YWJsZUZpZWxkIChl LCBDb250YWluZXJJbnB1dEFycmF5KSB7CitmdW5jdGlvbiBzaG93RWRpdGFibGVGaWVsZCAoZSwg Q29udGFpbmVySW5wdXRBcnJheSwgZm9jdXNMYXN0KSB7CiAgICAgdmFyIGlucHV0cyA9IG5ldyBB cnJheSgpOwogICAgIHZhciBpbnB1dEFyZWEgPSBZQUhPTy51dGlsLkRvbS5nZXQoQ29udGFpbmVy SW5wdXRBcnJheVsxXSk7ICAgIAogICAgIGlmICggISBpbnB1dEFyZWEgKXsKQEAgLTE3MywxMyAr MTc3LDI1IEBAIGZ1bmN0aW9uIHNob3dFZGl0YWJsZUZpZWxkIChlLCBDb250YWluZXIKICAgICAg ICAgaW5wdXRzID0gaW5wdXRBcmVhLmdldEVsZW1lbnRzQnlUYWdOYW1lKCdpbnB1dCcpOwogICAg IH0KICAgICBpZiAoIGlucHV0cy5sZW5ndGggPiAwICkgewotICAgICAgICAvLyBmb2N1cyBvbiB0 aGUgZmlyc3QgZmllbGQsIHRoaXMgbWFrZXMgaXQgZWFzaWVyIHRvIGVkaXQKLSAgICAgICAgaW5w dXRzWzBdLmZvY3VzKCk7Ci0gICAgICAgIGlucHV0c1swXS5zZWxlY3QoKTsKKyAgICAgICAgaWYg KGZvY3VzTGFzdCkgeworICAgICAgICAgICAgLy8gZm9jdXMgb24gdGhlIGxhc3QgZmllbGQsIHNp bmNlIHN1bW1hcnkgaXMgbW9yZSBjb21tb24gdG8gZWRpdCB0aGFuIGFsaWFzCisgICAgICAgICAg ICBpbnB1dHNbaW5wdXRzLmxlbmd0aCAtIDFdLmZvY3VzKCk7CisgICAgICAgICAgICBpbnB1dHNb aW5wdXRzLmxlbmd0aCAtIDFdLnNlbGVjdCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgLy8gZm9jdXMgb24gdGhlIGZpcnN0IGZpZWxkLCB0aGlzIG1ha2VzIGl0IGVhc2llciB0byBl ZGl0CisgICAgICAgICAgICBpbnB1dHNbMF0uZm9jdXMoKTsKKyAgICAgICAgICAgIGlucHV0c1sw XS5zZWxlY3QoKTsKKyAgICAgICAgfQogICAgIH0KKworCiAgICAgWUFIT08udXRpbC5FdmVudC5w cmV2ZW50RGVmYXVsdChlKTsKIH0KIAorZnVuY3Rpb24gc2hvd0VkaXRhYmxlRmllbGRGb2N1c0xh c3QgKGUsIENvbnRhaW5lcklucHV0QXJyYXkpIHsKKyAgICBzaG93RWRpdGFibGVGaWVsZChlLCBD b250YWluZXJJbnB1dEFycmF5LCB0cnVlKTsKK30KKwogCiAvKiBjaGVja0ZvckNoYW5nZWRGaWVs ZFZhbHVlcyhlLCBhcnJheSApCiAgKiBGdW5jdGlvbiBjaGVja3MgaWYgYWZ0ZXIgdGhlIGF1dG9j b21wbGV0ZSBieSB0aGUgYnJvd3NlciBpZiB0aGUgdmFsdWVzIG1hdGNoIHRoZSBvcmlnaW5hbHMu CkBAIC0yMjEsNyArMjM3LDcgQEAgZnVuY3Rpb24gY2hlY2tGb3JDaGFuZ2VkRmllbGRWYWx1ZXMo ZSwgQwogZnVuY3Rpb24gaGlkZUFsaWFzQW5kU3VtbWFyeShzaG9ydF9kZXNjX3ZhbHVlLCBhbGlh c192YWx1ZSkgewogICAgIC8vIGNoZWNrIHRoZSBzaG9ydCBkZXNjIGZpZWxkCiAgICAgaGlkZUVk aXRhYmxlRmllbGQoICdzdW1tYXJ5X2FsaWFzX2NvbnRhaW5lcicsJ3N1bW1hcnlfYWxpYXNfaW5w dXQnLAotICAgICAgICAgICAgICAgICAgICAgICAnZWRpdG1lX2FjdGlvbicsJ3Nob3J0X2Rlc2Mn LCBzaG9ydF9kZXNjX3ZhbHVlKTsgIAorICAgICAgICAgICAgICAgICAgICAgICAnZWRpdG1lX2Fj dGlvbicsICdhbGlhc19ub25lZGl0X2Rpc3BsYXknLCAnc2hvcnRfZGVzY19ub25lZGl0X2Rpc3Bs YXknLCAnc2hvcnRfZGVzYycsIHNob3J0X2Rlc2NfdmFsdWUpOyAgCiAgICAgLy8gY2hlY2sgdGhh dCB0aGUgYWxpYXMgaGFzbid0IGNoYW5nZWQKICAgICB2YXIgYnpfYWxpYXNfY2hlY2tfYXJyYXkg PSBuZXcgQXJyYXkoJ3N1bW1hcnlfYWxpYXNfY29udGFpbmVyJywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnc3VtbWFyeV9hbGlhc19pbnB1dCcsICdhbGlhcycsIGFsaWFz X3ZhbHVlKTs= 32240 2009-07-03 10:23:01 -0700 2009-07-03 14:02:55 -0700 Patch v3 bugs-26950-v3.diff text/plain 4517 ddkilzer ZGlmZiAtLWdpdCBhL0J1Z3NTaXRlL0NoYW5nZUxvZyBiL0J1Z3NTaXRlL0NoYW5nZUxvZwppbmRl eCA5NjQyOTBiLi45ZTdmZmNkIDEwMDY0NAotLS0gYS9CdWdzU2l0ZS9DaGFuZ2VMb2cKKysrIGIv QnVnc1NpdGUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMDktMDctMDMgIERhdmlkIEtp bHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBCdWcgMjY5NTA6IE1ha2UgdGhl IHN1bW1hcnkgYW5kIGFsaWFzIGZpZWxkcyBzdXBwb3J0IGNsaWNrLXRvLWVkaXQKKyAgICAgICAg PGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjk1MD4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPcmlnaW5hbCBwYXRjaCBi eSBNYWNpZWogU3RhY2hvd2lhay4KKworICAgICAgICAqIGpzL2ZpZWxkLmpzOgorICAgICAgICAo aGlkZUVkaXRhYmxlRmllbGQpOiBVcGRhdGVkIHRvIGFkZCBjbGljayBldmVudCBsaXN0ZW5lcnMg dG8gdGhlCisgICAgICAgIGFsaWFzIGFuZCBzaG9ydCBkZXNjcmlwdGlvbiBlbGVtZW50cyB0byBt YWtlIHRoZW0gZWFzaWVyIHRvCisgICAgICAgIGVkaXQuICBSZW5hbWVkIGZpZWxkX2lkIHBhcmFt ZXRlciB0byBmaWVsZDJfaWQgKHNob3J0CisgICAgICAgIGRlc2NyaXB0aW9uIGlkKSBhbmQgYWRk ZWQgYSBmaWVsZDFfaWQgcGFyYW1ldGVyIChhbGlhcyBpZCkuCisgICAgICAgIChzaG93RWRpdGFi bGVGaWVsZCk6IElmIGEgdGhpcmQgcGFyYW1ldGVyIGlzIHBhc3NlZCBpbiB0aGUKKyAgICAgICAg Q29udGFpbmVySW5wdXRBcnJheSBwYXJhbWV0ZXIsIHVzZSBpdCB0byBmaW5kIHRoZSBlbGVtZW50 IHRvCisgICAgICAgIGZvY3VzLiAgT3RoZXJ3aXNlLCBmYWxsIGJhY2sgdG8gdGhlIG9yaWdpbmFs IGJlaGF2aW9yIG9mCisgICAgICAgIGZvY3VzaW5nIHRoZSBmaXJzdCBpbnB1dCBmaWVsZC4KKyAg ICAgICAgKGhpZGVBbGlhc0FuZFN1bW1hcnkpOiBDaGFuZ2VkIHRvIHBhc3MgdGhlIGlkIGZvciB0 aGUgYWxpYXMKKyAgICAgICAgZWxlbWVudCB0byBoaWRlRWRpdGFibGVGaWVsZCgpLgorCiAyMDA5 LTA3LTAyICBEYXZpZCBELiBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAg Q29uZmlnIGZpbGUgZm9yIGNvbnRyaWIvcmVjb2RlLnBsIHdoZW4gdXBncmFkaW5nIGJ1Z3Mud2Vi a2l0Lm9yZwpkaWZmIC0tZ2l0IGEvQnVnc1NpdGUvanMvZmllbGQuanMgYi9CdWdzU2l0ZS9qcy9m aWVsZC5qcwppbmRleCBhMWI2MjQ1Li4yNDI5ZTgyIDEwMDY0NAotLS0gYS9CdWdzU2l0ZS9qcy9m aWVsZC5qcworKysgYi9CdWdzU2l0ZS9qcy9maWVsZC5qcwpAQCAtMTM4LDE0ICsxMzgsMTggQEAg ZnVuY3Rpb24gdXBkYXRlQ2FsZW5kYXJGcm9tRmllbGQoZGF0ZV9maWVsZCkgewogCiAKIC8qIEhp ZGUgaW5wdXQgZmllbGRzIGFuZCBzaG93IHRoZSB0ZXh0IHdpdGggKGVkaXQpIG5leHQgdG8gaXQg Ki8gIAotZnVuY3Rpb24gaGlkZUVkaXRhYmxlRmllbGQoIGNvbnRhaW5lciwgaW5wdXQsIGFjdGlv biwgZmllbGRfaWQsIG9yaWdpbmFsX3ZhbHVlICkgeworZnVuY3Rpb24gaGlkZUVkaXRhYmxlRmll bGQoIGNvbnRhaW5lciwgaW5wdXQsIGFjdGlvbiwgZmllbGQxX2lkLCBmaWVsZDJfaWQsIG9yaWdp bmFsX3ZhbHVlICkgewogICAgIFlBSE9PLnV0aWwuRG9tLnNldFN0eWxlKGNvbnRhaW5lciwgJ2Rp c3BsYXknLCAnaW5saW5lJyk7CiAgICAgWUFIT08udXRpbC5Eb20uc2V0U3R5bGUoaW5wdXQsICdk aXNwbGF5JywgJ25vbmUnKTsKICAgICBZQUhPTy51dGlsLkV2ZW50LmFkZExpc3RlbmVyKGFjdGlv biwgJ2NsaWNrJywgc2hvd0VkaXRhYmxlRmllbGQsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBuZXcgQXJyYXkoY29udGFpbmVyLCBpbnB1dCkpOwotICAgIGlmKGZpZWxkX2lkICE9 ICIiKXsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBBcnJheShjb250YWlu ZXIsIGlucHV0LCBmaWVsZDJfaWQpKTsKKyAgICBZQUhPTy51dGlsLkV2ZW50LmFkZExpc3RlbmVy KGZpZWxkMV9pZCArICdfbm9uZWRpdF9kaXNwbGF5JywgJ2NsaWNrJywgc2hvd0VkaXRhYmxlRmll bGQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuZXcgQXJyYXkoY29udGFpbmVy LCBpbnB1dCwgZmllbGQxX2lkKSk7CisgICAgWUFIT08udXRpbC5FdmVudC5hZGRMaXN0ZW5lcihm aWVsZDJfaWQgKyAnX25vbmVkaXRfZGlzcGxheScsICdjbGljaycsIHNob3dFZGl0YWJsZUZpZWxk LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV3IEFycmF5KGNvbnRhaW5lciwg aW5wdXQsIGZpZWxkMl9pZCkpOworICAgIGlmKGZpZWxkMl9pZCAhPSAiIil7CiAgICAgICAgIFlB SE9PLnV0aWwuRXZlbnQuYWRkTGlzdGVuZXIod2luZG93LCAnbG9hZCcsIGNoZWNrRm9yQ2hhbmdl ZEZpZWxkVmFsdWVzLAotICAgICAgICAgICAgICAgICAgICAgICAgbmV3IEFycmF5KGNvbnRhaW5l ciwgaW5wdXQsIGZpZWxkX2lkLCBvcmlnaW5hbF92YWx1ZSkpOworICAgICAgICAgICAgICAgICAg ICAgICAgbmV3IEFycmF5KGNvbnRhaW5lciwgaW5wdXQsIGZpZWxkMl9pZCwgb3JpZ2luYWxfdmFs dWUpKTsKICAgICB9CiB9CiAKQEAgLTE1Niw2ICsxNjAsNyBAQCBmdW5jdGlvbiBoaWRlRWRpdGFi bGVGaWVsZCggY29udGFpbmVyLCBpbnB1dCwgYWN0aW9uLCBmaWVsZF9pZCwgb3JpZ2luYWxfdmFs dWUgKQogICogdmFyIENvbnRhaW5lcklucHV0QXJyYXk6IEFuIGFycmF5IGNvbnRhaW5pbmcgdGhl IChlZGl0KSBhbmQgdGV4dCBhcmVhIGFuZCB0aGUgaW5wdXQgYmVpbmcgZGlzcGxheWVkCiAgKiB2 YXIgQ29udGFpbmVySW5wdXRBcnJheVswXTogdGhlIGNvbmFpbmVyIHRoYXQgd2lsbCBiZSBoaWRk ZW4gdXN1YWxseSBzaG93cyB0aGUgKGVkaXQpIHRleHQKICAqIHZhciBDb250YWluZXJJbnB1dEFy cmF5WzFdOiB0aGUgaW5wdXQgYXJlYSBhbmQgbGFiZWwgdGhhdCB3aWxsIGJlIGRpc3BsYXllZAor ICogdmFyIENvbnRhaW5lcklucHV0QXJyYXlbMl06IFtvcHRpb25hbF0gdGhlIGlkIG9mIHRoZSBp bnB1dCBlbGVtZW50IHRvIGZvY3VzCiAgKgogICovCiBmdW5jdGlvbiBzaG93RWRpdGFibGVGaWVs ZCAoZSwgQ29udGFpbmVySW5wdXRBcnJheSkgewpAQCAtMTczLDkgKzE3OCwxNiBAQCBmdW5jdGlv biBzaG93RWRpdGFibGVGaWVsZCAoZSwgQ29udGFpbmVySW5wdXRBcnJheSkgewogICAgICAgICBp bnB1dHMgPSBpbnB1dEFyZWEuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ2lucHV0Jyk7CiAgICAgfQog ICAgIGlmICggaW5wdXRzLmxlbmd0aCA+IDAgKSB7Ci0gICAgICAgIC8vIGZvY3VzIG9uIHRoZSBm aXJzdCBmaWVsZCwgdGhpcyBtYWtlcyBpdCBlYXNpZXIgdG8gZWRpdAotICAgICAgICBpbnB1dHNb MF0uZm9jdXMoKTsKLSAgICAgICAgaW5wdXRzWzBdLnNlbGVjdCgpOworICAgICAgICB2YXIgZWxl bWVudFRvRm9jdXMgPSBZQUhPTy51dGlsLkRvbS5nZXQoQ29udGFpbmVySW5wdXRBcnJheVsyXSk7 ICAgIAorICAgICAgICBpZiAoZWxlbWVudFRvRm9jdXMpIHsKKyAgICAgICAgICAgIC8vIGZvY3Vz IG9uIHRoZSByZXF1ZXN0ZWQgZmllbGQKKyAgICAgICAgICAgIGVsZW1lbnRUb0ZvY3VzLmZvY3Vz KCk7CisgICAgICAgICAgICBlbGVtZW50VG9Gb2N1cy5zZWxlY3QoKTsKKyAgICAgICAgfSBlbHNl IHsKKyAgICAgICAgICAgIC8vIGZvY3VzIG9uIHRoZSBmaXJzdCBmaWVsZCwgdGhpcyBtYWtlcyBp dCBlYXNpZXIgdG8gZWRpdAorICAgICAgICAgICAgaW5wdXRzWzBdLmZvY3VzKCk7CisgICAgICAg ICAgICBpbnB1dHNbMF0uc2VsZWN0KCk7CisgICAgICAgIH0KICAgICB9CiAgICAgWUFIT08udXRp bC5FdmVudC5wcmV2ZW50RGVmYXVsdChlKTsKIH0KQEAgLTIyMSw3ICsyMzMsNyBAQCBmdW5jdGlv biBjaGVja0ZvckNoYW5nZWRGaWVsZFZhbHVlcyhlLCBDb250YWluZXJJbnB1dEFycmF5ICkgewog ZnVuY3Rpb24gaGlkZUFsaWFzQW5kU3VtbWFyeShzaG9ydF9kZXNjX3ZhbHVlLCBhbGlhc192YWx1 ZSkgewogICAgIC8vIGNoZWNrIHRoZSBzaG9ydCBkZXNjIGZpZWxkCiAgICAgaGlkZUVkaXRhYmxl RmllbGQoICdzdW1tYXJ5X2FsaWFzX2NvbnRhaW5lcicsJ3N1bW1hcnlfYWxpYXNfaW5wdXQnLAot ICAgICAgICAgICAgICAgICAgICAgICAnZWRpdG1lX2FjdGlvbicsJ3Nob3J0X2Rlc2MnLCBzaG9y dF9kZXNjX3ZhbHVlKTsgIAorICAgICAgICAgICAgICAgICAgICAgICAnZWRpdG1lX2FjdGlvbics ICdhbGlhcycsICdzaG9ydF9kZXNjJywgc2hvcnRfZGVzY192YWx1ZSk7ICAKICAgICAvLyBjaGVj ayB0aGF0IHRoZSBhbGlhcyBoYXNuJ3QgY2hhbmdlZAogICAgIHZhciBiel9hbGlhc19jaGVja19h cnJheSA9IG5ldyBBcnJheSgnc3VtbWFyeV9hbGlhc19jb250YWluZXInLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICdzdW1tYXJ5X2FsaWFzX2lucHV0JywgJ2FsaWFzJywg YWxpYXNfdmFsdWUpOwo=