20238 2008-07-30 19:46:09 -0700 Minor bugs with style editing in the Inspector 2008-07-30 21:05:12 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Minor --- 1 timothy timothy aroben oldest_to_newest 87460 0 timothy 2008-07-30 19:46:09 -0700 The scroll position stays where it was when editing a string that was longer than the editing input area. The text shifts when entering and exiting editing mode. Child elements are sometimes not restored for shorthands. Shorthands are not always expanded again after editing. Color swatches should be hidden when editing. 87461 1 aroben 2008-07-30 19:46:59 -0700 Maybe we should have separate bugs for each of these issues? 87462 2 22572 timothy 2008-07-30 19:47:09 -0700 Created attachment 22572 Proposed patch 87463 3 22572 aroben 2008-07-30 19:51:11 -0700 Comment on attachment 22572 Proposed patch - // Lie about out children to prevent toggling on click. + this.wasExpanded = this.expanded; + + // Lie about our children to prevent expanding on double click and to collapse shorthands. + this.reallyHasChildren = this.hasChildren; this.hasChildren = false; if (!selectElement) @@ -563,23 +564,26 @@ WebInspector.StylePropertyTreeElement.prototype = { window.getSelection().setBaseAndExtent(selectElement, 0, selectElement, 1); - WebInspector.startEditing(this.listItemElement, this.editingCommitted.bind(this), this.editingCancelled.bind(this), wasExpanded); + WebInspector.startEditing(this.listItemElement, this.editingCommitted.bind(this), this.editingCancelled.bind(this)); I guess you could pass the information along in the context parameter to startEditing instead of storing it on this. That would save you from having to delete the properties later. But it doesn't matter too much either way. r=me! 87464 4 aroben 2008-07-30 19:51:29 -0700 Oh, don't forget to mention the bug number in the URL. 87469 5 timothy 2008-07-30 21:05:12 -0700 Landed in r35472. 22572 2008-07-30 19:47:09 -0700 2008-07-30 19:51:11 -0700 Proposed patch 0001-Fix-various-minor-bugs-with-style-editing-in.patch text/plain 7139 timothy RnJvbSBiM2RmMTk5MDZiOWMyNGFiNzkzYWNlN2Y3YTI3YTMzMWQyOThlMmRlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBXZWQsIDMwIEp1bCAyMDA4IDE3OjM0OjIyIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gICAg ICAgICBGaXggdmFyaW91cyBtaW5vciBidWdzIHdpdGggc3R5bGUgZWRpdGluZyBpbiB0aGUgSW5z cGVjdG9yLgoKICAgICAgICAtIFJlc3RvcmVzIHRoZSBzY3JvbGwgcG9zaXRpb24gdG8gMCwwIHdo ZW4gZmluaXNoZWQgZWRpdGluZyBhCiAgICAgICAgc3RyaW5nIHRoYXQgd2FzIGxvbmdlciB0aGFu IHRoZSBlZGl0aW5nIGlucHV0IGFyZWEuCgogICAgICAgIC0gQWRqdXN0cyB0aGUgbWFyZ2luIG9m IHRoZSBsaXN0IGl0ZW0gdG8gZW5zdXJlIHRoZSB0ZXh0IGRvZXMKICAgICAgICBub3Qgc2hpZnQg d2hlbiBlbnRlcmluZyBhbmQgZXhpdGluZyBlZGl0aW5nIG1vZGUuCgogICAgICAgIC0gUmVsaWFi bHkgcmVtZW1iZXJzIGlmIGEgc2hvcnRoYW5kIGhhcyBjaGlsZHJlbiB3aGVuIHRoZQogICAgICAg IGNoaWxkcmVuIGhhdmVuJ3QgYmVlbiBwb3B1bGF0ZWQgeWV0LgoKICAgICAgICAtIFJlbGlhYmx5 IHJlbWVtYmVycyBpZiBhIHNob3J0aGFuZCB3YXMgZXhwYW5kZWQsIGFuZCBleHBhbmRzCiAgICAg ICAgaWYgbmVlZGVkIGFmdGVyIGVkaXRpbmcgZmluaXNoZXMuCgogICAgICAgIC0gSGlkZXMgY29s b3Igc3dhdGNoZXMgd2hlbiBlZGl0aW5nLgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KCiAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9TdHlsZXNTaWRlYmFyUGFuZS5qczoKICAg ICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUuc3Rh cnRFZGl0aW5nKToKICAgICAgICBTdG9yZSB0aGUgZXhwYW5kZWQgc3RhdGUgYW5kIGNoaWxkcmVu IHN0YXRlIGluIHdhc0V4cGFuZGVkIGFuZAogICAgICAgIHJlYWxseUhhc0NoaWxkcmVuIHByb3Bl cnRpZXMuCiAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJv dG90eXBlLmVkaXRpbmdFbmRlZCk6CiAgICAgICAgUmVtb3ZlZCB0aGUgd2FzRXhwYW5kZWQgYXJn dW1lbnQgYW5kIHVzZSB0aGUgcmVhbGx5SGFzQ2hpbGRyZW4gYW5kCiAgICAgICAgd2FzRXhwYW5k ZWQgcHJvcGVydGllcyB0byByZXN0b3JlIHN0YXRlLiBEZWxldGVzIHRoZSBzdGF0ZSBwcm9wZXJ0 aWVzLgogICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3Rv dHlwZS5lZGl0aW5nQ2FuY2VsbGVkKToKICAgICAgICBSZW1vdmVkIHRoZSB3YXNFeHBhbmRlZCBh cmd1bWVudC4KICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5w cm90b3R5cGUuZWRpdGluZ0NvbW1pdHRlZCk6CiAgICAgICAgUmVtb3ZlZCB0aGUgd2FzRXhwYW5k ZWQgYXJndW1lbnQuCiAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzOiBUd2Vh ayB0aGUgbWFyZ2luIGFuZCBoaWRlcyB0aGUgY29sb3IKICAgICAgICBzd2F0Y2hlcy4gQUxzbyBy ZW1vdmVzIGEgcnVsZSB0aGF0IHdhcyBub3QgbmVlZGVkLgogICAgICAgICogcGFnZS9pbnNwZWN0 b3IvaW5zcGVjdG9yLmpzOgogICAgICAgIChXZWJJbnNwZWN0b3Iuc3RhcnRFZGl0aW5nKTogUmVz dG9yZSB0aGUgc2Nyb2xsTGVmdCBhbmQgc2Nyb2xsVG9wCiAgICAgICAgdG8gemVybyB3aGVuIGVk aXRpbmcgZmluaXNoZXMuCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICB8ICAgMzcgKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL3BhZ2Uv aW5zcGVjdG9yL1N0eWxlc1NpZGViYXJQYW5lLmpzIHwgICAyNCArKysrKysrKysrLS0tLS0tLQog V2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzICAgICAgICB8ICAgIDQgKy0KIFdl YkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzICAgICAgICAgfCAgICAyICsKIDQgZmls ZXMgY2hhbmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyYTMwMGYwLi42 MGE1ZTgxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDA4LTA3LTMwICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1v dGh5QGFwcGxlLmNvbT4KKworICAgICAgICBGaXggdmFyaW91cyBtaW5vciBidWdzIHdpdGggc3R5 bGUgZWRpdGluZyBpbiB0aGUgSW5zcGVjdG9yLgorCisgICAgICAgIC0gUmVzdG9yZXMgdGhlIHNj cm9sbCBwb3NpdGlvbiB0byAwLDAgd2hlbiBmaW5pc2hlZCBlZGl0aW5nIGEKKyAgICAgICAgc3Ry aW5nIHRoYXQgd2FzIGxvbmdlciB0aGFuIHRoZSBlZGl0aW5nIGlucHV0IGFyZWEuCisKKyAgICAg ICAgLSBBZGp1c3RzIHRoZSBtYXJnaW4gb2YgdGhlIGxpc3QgaXRlbSB0byBlbnN1cmUgdGhlIHRl eHQgZG9lcworICAgICAgICBub3Qgc2hpZnQgd2hlbiBlbnRlcmluZyBhbmQgZXhpdGluZyBlZGl0 aW5nIG1vZGUuCisKKyAgICAgICAgLSBSZWxpYWJseSByZW1lbWJlcnMgaWYgYSBzaG9ydGhhbmQg aGFzIGNoaWxkcmVuIHdoZW4gdGhlCisgICAgICAgIGNoaWxkcmVuIGhhdmVuJ3QgYmVlbiBwb3B1 bGF0ZWQgeWV0LgorCisgICAgICAgIC0gUmVsaWFibHkgcmVtZW1iZXJzIGlmIGEgc2hvcnRoYW5k IHdhcyBleHBhbmRlZCwgYW5kIGV4cGFuZHMKKyAgICAgICAgaWYgbmVlZGVkIGFmdGVyIGVkaXRp bmcgZmluaXNoZXMuCisKKyAgICAgICAgLSBIaWRlcyBjb2xvciBzd2F0Y2hlcyB3aGVuIGVkaXRp bmcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw YWdlL2luc3BlY3Rvci9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLnN0YXJ0RWRpdGluZyk6CisgICAg ICAgIFN0b3JlIHRoZSBleHBhbmRlZCBzdGF0ZSBhbmQgY2hpbGRyZW4gc3RhdGUgaW4gd2FzRXhw YW5kZWQgYW5kCisgICAgICAgIHJlYWxseUhhc0NoaWxkcmVuIHByb3BlcnRpZXMuCisgICAgICAg IChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5lZGl0aW5n RW5kZWQpOgorICAgICAgICBSZW1vdmVkIHRoZSB3YXNFeHBhbmRlZCBhcmd1bWVudCBhbmQgdXNl IHRoZSByZWFsbHlIYXNDaGlsZHJlbiBhbmQKKyAgICAgICAgd2FzRXhwYW5kZWQgcHJvcGVydGll cyB0byByZXN0b3JlIHN0YXRlLiBEZWxldGVzIHRoZSBzdGF0ZSBwcm9wZXJ0aWVzLgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUuZWRpdGlu Z0NhbmNlbGxlZCk6CisgICAgICAgIFJlbW92ZWQgdGhlIHdhc0V4cGFuZGVkIGFyZ3VtZW50Lgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUu ZWRpdGluZ0NvbW1pdHRlZCk6CisgICAgICAgIFJlbW92ZWQgdGhlIHdhc0V4cGFuZGVkIGFyZ3Vt ZW50LgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3M6IFR3ZWFrIHRoZSBt YXJnaW4gYW5kIGhpZGVzIHRoZSBjb2xvcgorICAgICAgICBzd2F0Y2hlcy4gQUxzbyByZW1vdmVz IGEgcnVsZSB0aGF0IHdhcyBub3QgbmVlZGVkLgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2lu c3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcpOiBSZXN0b3Jl IHRoZSBzY3JvbGxMZWZ0IGFuZCBzY3JvbGxUb3AKKyAgICAgICAgdG8gemVybyB3aGVuIGVkaXRp bmcgZmluaXNoZXMuCisKIDIwMDgtMDctMjkgIEtldmluIE1jQ3VsbG91Z2ggIDxrbWNjdWxsb3Vn aEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9wYWdl L2luc3BlY3Rvci9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA4N2I4YjIxLi44ZGQ5MTdjIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1N0eWxlc1NpZGViYXJQYW5lLmpzCisr KyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTU1Myw5 ICs1NTMsMTAgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuaXNCZWluZ0VkaXRlZCh0aGlzLmxpc3RJ dGVtRWxlbWVudCkgfHwgKHRoaXMudHJlZU91dGxpbmUuc2VjdGlvbiAmJiAhdGhpcy50cmVlT3V0 bGluZS5zZWN0aW9uLmVkaXRhYmxlKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2 YXIgd2FzRXhwYW5kZWQgPSB0aGlzLmV4cGFuZGVkOwotICAgICAgICB0aGlzLmNvbGxhcHNlKCk7 Ci0gICAgICAgIC8vIExpZSBhYm91dCBvdXQgY2hpbGRyZW4gdG8gcHJldmVudCB0b2dnbGluZyBv biBjbGljay4KKyAgICAgICAgdGhpcy53YXNFeHBhbmRlZCA9IHRoaXMuZXhwYW5kZWQ7CisKKyAg ICAgICAgLy8gTGllIGFib3V0IG91ciBjaGlsZHJlbiB0byBwcmV2ZW50IGV4cGFuZGluZyBvbiBk b3VibGUgY2xpY2sgYW5kIHRvIGNvbGxhcHNlIHNob3J0aGFuZHMuCisgICAgICAgIHRoaXMucmVh bGx5SGFzQ2hpbGRyZW4gPSB0aGlzLmhhc0NoaWxkcmVuOwogICAgICAgICB0aGlzLmhhc0NoaWxk cmVuID0gZmFsc2U7CiAKICAgICAgICAgaWYgKCFzZWxlY3RFbGVtZW50KQpAQCAtNTYzLDIzICs1 NjQsMjYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUg PSB7CiAKICAgICAgICAgd2luZG93LmdldFNlbGVjdGlvbigpLnNldEJhc2VBbmRFeHRlbnQoc2Vs ZWN0RWxlbWVudCwgMCwgc2VsZWN0RWxlbWVudCwgMSk7CiAKLSAgICAgICAgV2ViSW5zcGVjdG9y LnN0YXJ0RWRpdGluZyh0aGlzLmxpc3RJdGVtRWxlbWVudCwgdGhpcy5lZGl0aW5nQ29tbWl0dGVk LmJpbmQodGhpcyksIHRoaXMuZWRpdGluZ0NhbmNlbGxlZC5iaW5kKHRoaXMpLCB3YXNFeHBhbmRl ZCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcodGhpcy5saXN0SXRlbUVsZW1l bnQsIHRoaXMuZWRpdGluZ0NvbW1pdHRlZC5iaW5kKHRoaXMpLCB0aGlzLmVkaXRpbmdDYW5jZWxs ZWQuYmluZCh0aGlzKSk7CiAgICAgfSwKIAotICAgIGVkaXRpbmdFbmRlZDogZnVuY3Rpb24od2Fz RXhwYW5kZWQpCisgICAgZWRpdGluZ0VuZGVkOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0 aGlzLmhhc0NoaWxkcmVuID0gKHRoaXMuY2hpbGRyZW4ubGVuZ3RoID8gdHJ1ZSA6IGZhbHNlKTsK LSAgICAgICAgaWYgKHdhc0V4cGFuZGVkKQorICAgICAgICB0aGlzLmhhc0NoaWxkcmVuID0gdGhp cy5yZWFsbHlIYXNDaGlsZHJlbjsKKyAgICAgICAgZGVsZXRlIHRoaXMucmVhbGx5SGFzQ2hpbGRy ZW47CisKKyAgICAgICAgaWYgKHRoaXMud2FzRXhwYW5kZWQpCiAgICAgICAgICAgICB0aGlzLmV4 cGFuZCgpOworICAgICAgICBkZWxldGUgdGhpcy53YXNFeHBhbmRlZDsKICAgICB9LAogCi0gICAg ZWRpdGluZ0NhbmNlbGxlZDogZnVuY3Rpb24oZSwgd2FzRXhwYW5kZWQpCisgICAgZWRpdGluZ0Nh bmNlbGxlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLmVkaXRpbmdFbmRl ZCh3YXNFeHBhbmRlZCk7CisgICAgICAgIHRoaXMuZWRpdGluZ0VuZGVkKCk7CiAgICAgICAgIHRo aXMudXBkYXRlVGl0bGUoKTsKICAgICB9LAogCi0gICAgZWRpdGluZ0NvbW1pdHRlZDogZnVuY3Rp b24oZSwgdXNlcklucHV0LCBwcmV2aW91c0NvbnRlbnQsIHdhc0V4cGFuZGVkKQorICAgIGVkaXRp bmdDb21taXR0ZWQ6IGZ1bmN0aW9uKGV2ZW50LCB1c2VySW5wdXQsIHByZXZpb3VzQ29udGVudCkK ICAgICB7CiAgICAgICAgIHRoaXMuZWRpdGluZ0VuZGVkKCk7CiAKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3Iv aW5zcGVjdG9yLmNzcwppbmRleCA1ZDU5YTk0Li41MjVjMDU5IDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rv ci9pbnNwZWN0b3IuY3NzCkBAIC0xMTY3LDExICsxMTY3LDExIEBAIGJvZHkuaW5hY3RpdmUgLnBs YWNhcmQuc2VsZWN0ZWQgewogfQogCiAuc2VjdGlvbiAucHJvcGVydGllcyBsaS5lZGl0aW5nIHsK LSAgICBtYXJnaW4tbGVmdDogOHB4OworICAgIG1hcmdpbi1sZWZ0OiAxMHB4OwogICAgIHRleHQt b3ZlcmZsb3c6IGNsaXA7CiB9CiAKLS5zZWN0aW9uIC5wcm9wZXJ0aWVzIGxpLmVkaXRpbmcucGFy ZW50OjpiZWZvcmUgeworbGkuZWRpdGluZyAuc3dhdGNoIHsKICAgICBkaXNwbGF5OiBub25lOwog fQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcyBiL1dl YkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzCmluZGV4IGEzOTJhMWUuLjdjZWExN2Mg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzCisrKyBiL1dl YkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzCkBAIC0xMTUwLDYgKzExNTAsOCBAQCBX ZWJJbnNwZWN0b3Iuc3RhcnRFZGl0aW5nID0gZnVuY3Rpb24oZWxlbWVudCwgY29tbWl0dGVkQ2Fs bGJhY2ssIGNhbmNlbGxlZENhbGxiYQogCiAgICAgICAgIHRoaXMucmVtb3ZlU3R5bGVDbGFzcygi ZWRpdGluZyIpOwogICAgICAgICB0aGlzLnRhYkluZGV4ID0gb2xkVGFiSW5kZXg7CisgICAgICAg IHRoaXMuc2Nyb2xsVG9wID0gMDsKKyAgICAgICAgdGhpcy5zY3JvbGxMZWZ0ID0gMDsKIAogICAg ICAgICB0aGlzLmhhbmRsZUtleUV2ZW50ID0gaGFuZGxlS2V5RXZlbnQ7CiAgICAgICAgIGVsZW1l bnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigiYmx1ciIsIGJsdXJFdmVudExpc3RlbmVyLCBmYWxzZSk7 Ci0tIAoxLjUuNC40Cgo=