<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182099] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182099">182099</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-27 19:56:24 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add Setter Icon for ObjectTreeView
https://bugs.webkit.org/show_bug.cgi?id=143129
Reviewed by Timothy Hatcher.
* UserInterface/Images/Pencil.svg: Added.
New icon used to indicate setter properties.
* Localizations/en.lproj/localizedStrings.js:
Remove "Read only" and replace with "Setter".
* UserInterface/Views/ObjectTreeArrayIndexTreeElement.js:
(WebInspector.ObjectTreeArrayIndexTreeElement.prototype._titleFragment):
(WebInspector.ObjectTreeArrayIndexTreeElement):
* UserInterface/Views/ObjectTreePropertyTreeElement.js:
(WebInspector.ObjectTreePropertyTreeElement.prototype._createTitlePropertyStyle):
(WebInspector.ObjectTreePropertyTreeElement.prototype._createTitleAPIStyle):
Update cases that created setter / getter elements.
* UserInterface/Views/ObjectTreeBaseTreeElement.js:
(WebInspector.ObjectTreeBaseTreeElement.prototype.createGetterElement):
(WebInspector.ObjectTreeBaseTreeElement.prototype.createInteractiveGetterElement): Deleted.
* UserInterface/Views/ObjectTreePropertyTreeElement.css:
(.object-tree-property :matches(.getter, .setter)):
(.object-tree-property .spacer):
(.object-tree-property .getter):
(.object-tree-property .setter):
(.object-tree-property .getter + .setter):
New setter element and styles. Setters are always non-interactable right now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeArrayIndexTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeBaseTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementcss">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesPencilsvg">trunk/Source/WebInspectorUI/UserInterface/Images/Pencil.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (182098 => 182099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-28 02:55:12 UTC (rev 182098)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-28 02:56:24 UTC (rev 182099)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-03-27 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Add Setter Icon for ObjectTreeView
+ https://bugs.webkit.org/show_bug.cgi?id=143129
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Images/Pencil.svg: Added.
+ New icon used to indicate setter properties.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ Remove "Read only" and replace with "Setter".
+
+ * UserInterface/Views/ObjectTreeArrayIndexTreeElement.js:
+ (WebInspector.ObjectTreeArrayIndexTreeElement.prototype._titleFragment):
+ (WebInspector.ObjectTreeArrayIndexTreeElement):
+ * UserInterface/Views/ObjectTreePropertyTreeElement.js:
+ (WebInspector.ObjectTreePropertyTreeElement.prototype._createTitlePropertyStyle):
+ (WebInspector.ObjectTreePropertyTreeElement.prototype._createTitleAPIStyle):
+ Update cases that created setter / getter elements.
+
+ * UserInterface/Views/ObjectTreeBaseTreeElement.js:
+ (WebInspector.ObjectTreeBaseTreeElement.prototype.createGetterElement):
+ (WebInspector.ObjectTreeBaseTreeElement.prototype.createInteractiveGetterElement): Deleted.
+ * UserInterface/Views/ObjectTreePropertyTreeElement.css:
+ (.object-tree-property :matches(.getter, .setter)):
+ (.object-tree-property .spacer):
+ (.object-tree-property .getter):
+ (.object-tree-property .setter):
+ (.object-tree-property .getter + .setter):
+ New setter element and styles. Setters are always non-interactable right now.
+
+2015-03-27 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Uncaught Exceptions with Context Menus
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143162
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (182098 => 182099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-03-28 02:55:12 UTC (rev 182098)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-03-28 02:56:24 UTC (rev 182099)
</span><span class="lines">@@ -363,7 +363,6 @@
</span><span class="cx"> localizedStrings["Query String"] = "Query String";
</span><span class="cx"> localizedStrings["Radial Gradient"] = "Radial Gradient";
</span><span class="cx"> localizedStrings["Range Issue"] = "Range Issue";
</span><del>-localizedStrings["Read only"] = "Read only";
</del><span class="cx"> localizedStrings["Readonly"] = "Readonly";
</span><span class="cx"> localizedStrings["Reasons for compositing:"] = "Reasons for compositing:";
</span><span class="cx"> localizedStrings["Recording"] = "Recording";
</span><span class="lines">@@ -414,6 +413,7 @@
</span><span class="cx"> localizedStrings["Session"] = "Session";
</span><span class="cx"> localizedStrings["Session Storage"] = "Session Storage";
</span><span class="cx"> localizedStrings["Set to Automatically Continue"] = "Set to Automatically Continue";
</span><ins>+localizedStrings["Setter"] = "Setter";
</ins><span class="cx"> localizedStrings["Shadow Content"] = "Shadow Content";
</span><span class="cx"> localizedStrings["Shared Focus"] = "Shared Focus";
</span><span class="cx"> localizedStrings["Show All"] = "Show All";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesPencilsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/Pencil.svg (0 => 182099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/Pencil.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Pencil.svg 2015-03-28 02:56:24 UTC (rev 182099)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2015 Apple Inc. All rights reserved. -->
+<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 3.323 14.956 L 2.346 10.828 L 8.125 1.468 L 13.23 4.62 L 7.451 13.98 L 3.323 14.956 Z M 6.711 4.709 L 10.966 7.335" fill="none" stroke="black"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeArrayIndexTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.js (182098 => 182099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.js 2015-03-28 02:55:12 UTC (rev 182098)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.js 2015-03-28 02:56:24 UTC (rev 182099)
</span><span class="lines">@@ -69,10 +69,9 @@
</span><span class="cx"> valueElement.appendChild(WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject(resolvedValue, this.resolvedValuePropertyPath()));
</span><span class="cx"> else {
</span><span class="cx"> if (this.property.hasGetter())
</span><del>- container.appendChild(this.createInteractiveGetterElement(true));
- if (!this.property.hasSetter())
- container.appendChild(this.createReadOnlyIconElement());
- // FIXME: What if just a setter?
</del><ins>+ container.appendChild(this.createGetterElement(true));
+ if (this.property.hasSetter())
+ container.appendChild(this.createSetterElement());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> valueElement.classList.add("value");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeBaseTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js (182098 => 182099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js 2015-03-28 02:55:12 UTC (rev 182098)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js 2015-03-28 02:56:24 UTC (rev 182099)
</span><span class="lines">@@ -113,12 +113,12 @@
</span><span class="cx"> return propertyPath.displayPath(this.propertyPathType());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- createInteractiveGetterElement(enabled)
</del><ins>+ createGetterElement(interactive)
</ins><span class="cx"> {
</span><span class="cx"> var getterElement = document.createElement("img");
</span><span class="cx"> getterElement.className = "getter";
</span><span class="cx">
</span><del>- if (!enabled) {
</del><ins>+ if (!interactive) {
</ins><span class="cx"> getterElement.classList.add("disabled");
</span><span class="cx"> getterElement.title = WebInspector.UIString("Getter");
</span><span class="cx"> return getterElement;
</span><span class="lines">@@ -140,12 +140,16 @@
</span><span class="cx"> return getterElement;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- createReadOnlyIconElement()
</del><ins>+ createSetterElement(interactive)
</ins><span class="cx"> {
</span><del>- var readOnlyElement = document.createElement("img");
- readOnlyElement.className = "read-only";
- readOnlyElement.title = WebInspector.UIString("Read only");
- return readOnlyElement;
</del><ins>+ var setterElement = document.createElement("img");
+ setterElement.className = "setter";
+ setterElement.title = WebInspector.UIString("Setter");
+
+ if (!interactive)
+ setterElement.classList.add("disabled");
+
+ return setterElement;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.css (182098 => 182099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.css 2015-03-28 02:55:12 UTC (rev 182098)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.css 2015-03-28 02:56:24 UTC (rev 182099)
</span><span class="lines">@@ -145,19 +145,39 @@
</span><span class="cx"> -webkit-padding-start: 0px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.object-tree-property :matches(.getter, .setter) {
+ position: relative;
+ opacity: 0.6;
+ vertical-align: top;
+}
+
+.object-tree-property .spacer {
+ margin-left: 4px;
+}
+
</ins><span class="cx"> .object-tree-property .getter {
</span><del>- position: relative;
</del><span class="cx"> top: 1px;
</span><span class="cx">
</span><span class="cx"> content: url(../Images/Eye.svg);
</span><del>- opacity: 0.6;
</del><span class="cx">
</span><span class="cx"> width: 16px;
</span><span class="cx"> height: 11px;
</span><del>- margin-left: 3px;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-.object-tree-property .getter.disabled {
</del><ins>+.object-tree-property .setter {
+ top: -1px;
+
+ content: url(../Images/Pencil.svg);
+
+ width: 13px;
+ height: 13px;
+}
+
+.object-tree-property .getter + .setter {
+ margin-left: 1px;
+}
+
+.object-tree-property :matches(.getter, .setter).disabled {
</ins><span class="cx"> opacity: 0.35;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreePropertyTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js (182098 => 182099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js 2015-03-28 02:55:12 UTC (rev 182098)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js 2015-03-28 02:56:24 UTC (rev 182099)
</span><span class="lines">@@ -169,10 +169,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> valueOrGetterElement = document.createElement("span");
</span><span class="cx"> if (this.property.hasGetter())
</span><del>- valueOrGetterElement.appendChild(this.createInteractiveGetterElement(this._mode !== WebInspector.ObjectTreeView.Mode.ClassAPI));
- if (!this.property.hasSetter())
- valueOrGetterElement.appendChild(this.createReadOnlyIconElement());
- // FIXME: What if just a setter?
</del><ins>+ valueOrGetterElement.appendChild(this.createGetterElement(this._mode !== WebInspector.ObjectTreeView.Mode.ClassAPI));
+ if (this.property.hasSetter())
+ valueOrGetterElement.appendChild(this.createSetterElement());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> valueOrGetterElement.classList.add("value");
</span><span class="lines">@@ -210,11 +209,12 @@
</span><span class="cx"> paramElement.textContent = this._functionParameterString();
</span><span class="cx"> container.appendChild(paramElement);
</span><span class="cx"> } else {
</span><ins>+ var spacer = container.appendChild(document.createElement("span"));
+ spacer.className = "spacer";
</ins><span class="cx"> if (this.property.hasGetter())
</span><del>- container.appendChild(this.createInteractiveGetterElement(this._mode !== WebInspector.ObjectTreeView.Mode.ClassAPI));
- if (!this.property.hasSetter())
- container.appendChild(this.createReadOnlyIconElement());
- // FIXME: What if just a setter?
</del><ins>+ container.appendChild(this.createGetterElement(this._mode !== WebInspector.ObjectTreeView.Mode.ClassAPI));
+ if (this.property.hasSetter())
+ container.appendChild(this.createSetterElement());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return container;
</span></span></pre>
</div>
</div>
</body>
</html>