Title: [182099] trunk/Source/WebInspectorUI
- Revision
- 182099
- Author
- joep...@webkit.org
- Date
- 2015-03-27 19:56:24 -0700 (Fri, 27 Mar 2015)
Log Message
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.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (182098 => 182099)
--- 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)
@@ -1,5 +1,37 @@
2015-03-27 Joseph Pecoraro <pecor...@apple.com>
+ 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 <pecor...@apple.com>
+
Web Inspector: Uncaught Exceptions with Context Menus
https://bugs.webkit.org/show_bug.cgi?id=143162
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (182098 => 182099)
--- 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)
@@ -363,7 +363,6 @@
localizedStrings["Query String"] = "Query String";
localizedStrings["Radial Gradient"] = "Radial Gradient";
localizedStrings["Range Issue"] = "Range Issue";
-localizedStrings["Read only"] = "Read only";
localizedStrings["Readonly"] = "Readonly";
localizedStrings["Reasons for compositing:"] = "Reasons for compositing:";
localizedStrings["Recording"] = "Recording";
@@ -414,6 +413,7 @@
localizedStrings["Session"] = "Session";
localizedStrings["Session Storage"] = "Session Storage";
localizedStrings["Set to Automatically Continue"] = "Set to Automatically Continue";
+localizedStrings["Setter"] = "Setter";
localizedStrings["Shadow Content"] = "Shadow Content";
localizedStrings["Shared Focus"] = "Shared Focus";
localizedStrings["Show All"] = "Show All";
Added: trunk/Source/WebInspectorUI/UserInterface/Images/Pencil.svg (0 => 182099)
--- 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)
@@ -0,0 +1,5 @@
+<?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>
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.js (182098 => 182099)
--- 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)
@@ -69,10 +69,9 @@
valueElement.appendChild(WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject(resolvedValue, this.resolvedValuePropertyPath()));
else {
if (this.property.hasGetter())
- container.appendChild(this.createInteractiveGetterElement(true));
- if (!this.property.hasSetter())
- container.appendChild(this.createReadOnlyIconElement());
- // FIXME: What if just a setter?
+ container.appendChild(this.createGetterElement(true));
+ if (this.property.hasSetter())
+ container.appendChild(this.createSetterElement());
}
valueElement.classList.add("value");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js (182098 => 182099)
--- 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)
@@ -113,12 +113,12 @@
return propertyPath.displayPath(this.propertyPathType());
}
- createInteractiveGetterElement(enabled)
+ createGetterElement(interactive)
{
var getterElement = document.createElement("img");
getterElement.className = "getter";
- if (!enabled) {
+ if (!interactive) {
getterElement.classList.add("disabled");
getterElement.title = WebInspector.UIString("Getter");
return getterElement;
@@ -140,12 +140,16 @@
return getterElement;
}
- createReadOnlyIconElement()
+ createSetterElement(interactive)
{
- var readOnlyElement = document.createElement("img");
- readOnlyElement.className = "read-only";
- readOnlyElement.title = WebInspector.UIString("Read only");
- return readOnlyElement;
+ var setterElement = document.createElement("img");
+ setterElement.className = "setter";
+ setterElement.title = WebInspector.UIString("Setter");
+
+ if (!interactive)
+ setterElement.classList.add("disabled");
+
+ return setterElement;
}
// Private
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.css (182098 => 182099)
--- 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)
@@ -145,19 +145,39 @@
-webkit-padding-start: 0px;
}
+.object-tree-property :matches(.getter, .setter) {
+ position: relative;
+ opacity: 0.6;
+ vertical-align: top;
+}
+
+.object-tree-property .spacer {
+ margin-left: 4px;
+}
+
.object-tree-property .getter {
- position: relative;
top: 1px;
content: url(../Images/Eye.svg);
- opacity: 0.6;
width: 16px;
height: 11px;
- margin-left: 3px;
}
-.object-tree-property .getter.disabled {
+.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 {
opacity: 0.35;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreePropertyTreeElement.js (182098 => 182099)
--- 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)
@@ -169,10 +169,9 @@
} else {
valueOrGetterElement = document.createElement("span");
if (this.property.hasGetter())
- valueOrGetterElement.appendChild(this.createInteractiveGetterElement(this._mode !== WebInspector.ObjectTreeView.Mode.ClassAPI));
- if (!this.property.hasSetter())
- valueOrGetterElement.appendChild(this.createReadOnlyIconElement());
- // FIXME: What if just a setter?
+ valueOrGetterElement.appendChild(this.createGetterElement(this._mode !== WebInspector.ObjectTreeView.Mode.ClassAPI));
+ if (this.property.hasSetter())
+ valueOrGetterElement.appendChild(this.createSetterElement());
}
valueOrGetterElement.classList.add("value");
@@ -210,11 +209,12 @@
paramElement.textContent = this._functionParameterString();
container.appendChild(paramElement);
} else {
+ var spacer = container.appendChild(document.createElement("span"));
+ spacer.className = "spacer";
if (this.property.hasGetter())
- container.appendChild(this.createInteractiveGetterElement(this._mode !== WebInspector.ObjectTreeView.Mode.ClassAPI));
- if (!this.property.hasSetter())
- container.appendChild(this.createReadOnlyIconElement());
- // FIXME: What if just a setter?
+ container.appendChild(this.createGetterElement(this._mode !== WebInspector.ObjectTreeView.Mode.ClassAPI));
+ if (this.property.hasSetter())
+ container.appendChild(this.createSetterElement());
}
return container;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
