<!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>[182905] 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/182905">182905</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-16 13:32:58 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Allow toggling the edibility of a DOMTreeOutline
https://bugs.webkit.org/show_bug.cgi?id=143814
Reviewed by Brian Burg.
By default a DOMTreeOutline will not be editable, but it will
provide a setter to enable editability for DOMTreeContentViews.
* UserInterface/Views/DOMTreeContentView.js:
(WebInspector.DOMTreeContentView):
Content Views always have editable DOM trees.
* UserInterface/Views/DOMTreeElement.js:
(WebInspector.DOMTreeElement.prototype.get editable):
(WebInspector.DOMTreeElement.prototype.onattach):
(WebInspector.DOMTreeElement.prototype.ondelete):
(WebInspector.DOMTreeElement.prototype.onenter):
(WebInspector.DOMTreeElement.prototype.ondblclick):
(WebInspector.DOMTreeElement.prototype._populateTagContextMenu):
(WebInspector.DOMTreeElement.prototype._populateTextContextMenu):
(WebInspector.DOMTreeElement.prototype._populateNodeContextMenu):
(WebInspector.DOMTreeElement.prototype._startEditing):
Do not provide editability options for shadow DOM or non-editable DOM tree.
* UserInterface/Views/DOMTreeOutline.js:
(WebInspector.DOMTreeOutline):
(WebInspector.DOMTreeOutline.prototype.get editable):
(WebInspector.DOMTreeOutline.prototype.set editable):
New state.
* UserInterface/Views/FormattedValue.css:
(.formatted-node > .dom-tree-outline li):
Nodes inside object trees were showing text selection when you right
clicked them. Normal selection is not possible. So force no selection.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFormattedValuecss">trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (182904 => 182905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-16 20:32:40 UTC (rev 182904)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-16 20:32:58 UTC (rev 182905)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2015-04-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Allow toggling the edibility of a DOMTreeOutline
+ https://bugs.webkit.org/show_bug.cgi?id=143814
+
+ Reviewed by Brian Burg.
+
+ By default a DOMTreeOutline will not be editable, but it will
+ provide a setter to enable editability for DOMTreeContentViews.
+
+ * UserInterface/Views/DOMTreeContentView.js:
+ (WebInspector.DOMTreeContentView):
+ Content Views always have editable DOM trees.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype.get editable):
+ (WebInspector.DOMTreeElement.prototype.onattach):
+ (WebInspector.DOMTreeElement.prototype.ondelete):
+ (WebInspector.DOMTreeElement.prototype.onenter):
+ (WebInspector.DOMTreeElement.prototype.ondblclick):
+ (WebInspector.DOMTreeElement.prototype._populateTagContextMenu):
+ (WebInspector.DOMTreeElement.prototype._populateTextContextMenu):
+ (WebInspector.DOMTreeElement.prototype._populateNodeContextMenu):
+ (WebInspector.DOMTreeElement.prototype._startEditing):
+ Do not provide editability options for shadow DOM or non-editable DOM tree.
+
+ * UserInterface/Views/DOMTreeOutline.js:
+ (WebInspector.DOMTreeOutline):
+ (WebInspector.DOMTreeOutline.prototype.get editable):
+ (WebInspector.DOMTreeOutline.prototype.set editable):
+ New state.
+
+ * UserInterface/Views/FormattedValue.css:
+ (.formatted-node > .dom-tree-outline li):
+ Nodes inside object trees were showing text selection when you right
+ clicked them. Normal selection is not possible. So force no selection.
+
+2015-04-16 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Give DOM Nodes a Context Menu to Log Element to the console
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143813
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js (182904 => 182905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2015-04-16 20:32:40 UTC (rev 182904)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2015-04-16 20:32:58 UTC (rev 182905)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> this._domTreeOutline = new WebInspector.DOMTreeOutline(true, true, true);
</span><span class="cx"> this._domTreeOutline.addEventListener(WebInspector.DOMTreeOutline.Event.SelectedNodeChanged, this._selectedNodeDidChange, this);
</span><span class="cx"> this._domTreeOutline.wireToDomAgent();
</span><ins>+ this._domTreeOutline.editable = true;
</ins><span class="cx"> this.element.appendChild(this._domTreeOutline.element);
</span><span class="cx">
</span><span class="cx"> WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.AttributeModified, this._domNodeChanged, this);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (182904 => 182905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-04-16 20:32:40 UTC (rev 182904)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-04-16 20:32:58 UTC (rev 182905)
</span><span class="lines">@@ -157,6 +157,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get editable()
+ {
+ if (this.representedObject.isInShadowTree())
+ return false;
+
+ return this.treeOutline.editable;
+ }
+
</ins><span class="cx"> get expandedChildrenLimit()
</span><span class="cx"> {
</span><span class="cx"> return this._expandedChildrenLimit;
</span><span class="lines">@@ -268,8 +276,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.updateTitle();
</span><del>- this.listItemElement.draggable = true;
- this.listItemElement.addEventListener("dragstart", this);
</del><ins>+
+ if (this.editable) {
+ this.listItemElement.draggable = true;
+ this.listItemElement.addEventListener("dragstart", this);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> onpopulate()
</span><span class="lines">@@ -490,7 +501,7 @@
</span><span class="cx">
</span><span class="cx"> ondelete()
</span><span class="cx"> {
</span><del>- if (this.representedObject.isInShadowTree())
</del><ins>+ if (!this.editable)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> var startTagTreeElement = this.treeOutline.findTreeElement(this.representedObject);
</span><span class="lines">@@ -503,6 +514,9 @@
</span><span class="cx">
</span><span class="cx"> onenter()
</span><span class="cx"> {
</span><ins>+ if (!this.editable)
+ return false;
+
</ins><span class="cx"> // On Enter or Return start editing the first attribute
</span><span class="cx"> // or create a new attribute on the selected element.
</span><span class="cx"> if (this.treeOutline.editing)
</span><span class="lines">@@ -528,6 +542,9 @@
</span><span class="cx">
</span><span class="cx"> ondblclick(event)
</span><span class="cx"> {
</span><ins>+ if (!this.editable)
+ return false;
+
</ins><span class="cx"> if (this._editing || this._elementCloseTag)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -586,10 +603,12 @@
</span><span class="cx"> var attribute = event.target.enclosingNodeOrSelfWithClass("html-attribute");
</span><span class="cx">
</span><span class="cx"> // Add attribute-related actions.
</span><del>- contextMenu.appendItem(WebInspector.UIString("Add Attribute"), this._addNewAttribute.bind(this));
- if (attribute)
- contextMenu.appendItem(WebInspector.UIString("Edit Attribute"), this._startEditingAttribute.bind(this, attribute, event.target));
- contextMenu.appendSeparator();
</del><ins>+ if (this.editable) {
+ contextMenu.appendItem(WebInspector.UIString("Add Attribute"), this._addNewAttribute.bind(this));
+ if (attribute)
+ contextMenu.appendItem(WebInspector.UIString("Edit Attribute"), this._startEditingAttribute.bind(this, attribute, event.target));
+ contextMenu.appendSeparator();
+ }
</ins><span class="cx">
</span><span class="cx"> if (WebInspector.cssStyleManager.canForcePseudoClasses()) {
</span><span class="cx"> var pseudoSubMenu = contextMenu.appendSubMenuItem(WebInspector.UIString("Forced Pseudo-Classes"));
</span><span class="lines">@@ -618,8 +637,7 @@
</span><span class="cx">
</span><span class="cx"> _populateTextContextMenu(contextMenu, textNode)
</span><span class="cx"> {
</span><del>- var node = this.representedObject;
- if (!node.isInShadowTree())
</del><ins>+ if (this.editable)
</ins><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Edit Text"), this._startEditingTextNode.bind(this, textNode));
</span><span class="cx">
</span><span class="cx"> this._populateNodeContextMenu(contextMenu);
</span><span class="lines">@@ -628,11 +646,10 @@
</span><span class="cx"> _populateNodeContextMenu(contextMenu)
</span><span class="cx"> {
</span><span class="cx"> // Add free-form node-related actions.
</span><del>- var node = this.representedObject;
- if (!node.isInShadowTree())
</del><ins>+ if (this.editable)
</ins><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Edit as HTML"), this._editAsHTML.bind(this));
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Copy as HTML"), this._copyHTML.bind(this));
</span><del>- if (!node.isInShadowTree())
</del><ins>+ if (this.editable)
</ins><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Delete Node"), this.remove.bind(this));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -641,7 +658,7 @@
</span><span class="cx"> if (this.treeOutline.selectedDOMNode() !== this.representedObject)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (this.representedObject.isInShadowTree())
</del><ins>+ if (!this.editable)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> var listItem = this._listItemNode;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js (182904 => 182905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2015-04-16 20:32:40 UTC (rev 182904)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2015-04-16 20:32:58 UTC (rev 182905)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> this._rootDOMNode = null;
</span><span class="cx"> this._selectedDOMNode = null;
</span><span class="cx">
</span><ins>+ this._editable = false;
</ins><span class="cx"> this._editing = false;
</span><span class="cx"> this._visible = false;
</span><span class="cx">
</span><span class="lines">@@ -137,6 +138,16 @@
</span><span class="cx"> this._selectedNodeChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get editable()
+ {
+ return this._editable;
+ }
+
+ set editable(x)
+ {
+ this._editable = x;
+ }
+
</ins><span class="cx"> get editing()
</span><span class="cx"> {
</span><span class="cx"> return this._editing;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFormattedValuecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.css (182904 => 182905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.css 2015-04-16 20:32:40 UTC (rev 182904)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.css 2015-04-16 20:32:58 UTC (rev 182905)
</span><span class="lines">@@ -72,6 +72,10 @@
</span><span class="cx"> -webkit-padding-start: 12px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.formatted-node > .dom-tree-outline li {
+ -webkit-user-select: none !important;
+}
+
</ins><span class="cx"> .formatted-node > .dom-tree-outline li.hovered:not(.selected) .selection {
</span><span class="cx"> display: block;
</span><span class="cx"> left: -1px;
</span></span></pre>
</div>
</div>
</body>
</html>