<!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>[46339] trunk/WebCore</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/46339">46339</a></dd>
<dt>Author</dt> <dd>abarth@webkit.org</dd>
<dt>Date</dt> <dd>2009-07-24 01:33:04 -0700 (Fri, 24 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-24  Joseph Pecoraro  &lt;joepeck02@gmail.com&gt;

        Reviewed by Timothy Hatcher.

        Inspector: Impossible to add an attribute to a node without attributes
        https://bugs.webkit.org/show_bug.cgi?id=21108

        * inspector/front-end/ElementsTreeOutline.js:
        (WebInspector.ElementsTreeElement):
        (WebInspector.ElementsTreeElement.prototype.set hovered):
        (WebInspector.ElementsTreeElement.prototype.toggleNewButton):
        (WebInspector.ElementsTreeElement.prototype.ondblclick):
        (WebInspector.ElementsTreeElement.prototype._startEditing):
        (WebInspector.ElementsTreeElement.prototype._addNewAttribute):
        (WebInspector.ElementsTreeElement.prototype._attributeEditingCommitted):
        * inspector/front-end/inspector.css:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreinspectorfrontendElementsTreeOutlinejs">trunk/WebCore/inspector/front-end/ElementsTreeOutline.js</a></li>
<li><a href="#trunkWebCoreinspectorfrontendinspectorcss">trunk/WebCore/inspector/front-end/inspector.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46338 => 46339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-24 08:31:33 UTC (rev 46338)
+++ trunk/WebCore/ChangeLog        2009-07-24 08:33:04 UTC (rev 46339)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2009-07-24  Joseph Pecoraro  &lt;joepeck02@gmail.com&gt;
+
+        Reviewed by Timothy Hatcher.
+
+        Inspector: Impossible to add an attribute to a node without attributes
+        https://bugs.webkit.org/show_bug.cgi?id=21108
+
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeElement):
+        (WebInspector.ElementsTreeElement.prototype.set hovered):
+        (WebInspector.ElementsTreeElement.prototype.toggleNewButton):
+        (WebInspector.ElementsTreeElement.prototype.ondblclick):
+        (WebInspector.ElementsTreeElement.prototype._startEditing):
+        (WebInspector.ElementsTreeElement.prototype._addNewAttribute):
+        (WebInspector.ElementsTreeElement.prototype._attributeEditingCommitted):
+        * inspector/front-end/inspector.css:
+
</ins><span class="cx"> 2009-07-24  Keishi Hattori  &lt;casey.hattori@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Timothy Hatcher.
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendElementsTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/ElementsTreeOutline.js (46338 => 46339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/ElementsTreeOutline.js        2009-07-24 08:31:33 UTC (rev 46338)
+++ trunk/WebCore/inspector/front-end/ElementsTreeOutline.js        2009-07-24 08:33:04 UTC (rev 46339)
</span><span class="lines">@@ -255,6 +255,10 @@
</span><span class="cx"> 
</span><span class="cx">     // The title will be updated in onattach.
</span><span class="cx">     TreeElement.call(this, &quot;&quot;, node, titleInfo.hasChildren);
</span><ins>+    
+    // Can add attributes
+    if (this.representedObject.nodeType == Node.ELEMENT_NODE)
+        this._canAddAttributes = true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebInspector.ElementsTreeElement.prototype = {
</span><span class="lines">@@ -296,9 +300,36 @@
</span><span class="cx">                 this.listItemElement.addStyleClass(&quot;hovered&quot;);
</span><span class="cx">             } else
</span><span class="cx">                 this.listItemElement.removeStyleClass(&quot;hovered&quot;);
</span><ins>+            if (this._canAddAttributes)
+                this.toggleNewAttributeButton();
</ins><span class="cx">         }
</span><span class="cx">     },
</span><span class="cx"> 
</span><ins>+    toggleNewAttributeButton: function()
+    {
+        function removeWhenEditing(event)
+        {
+            if (this._addAttributeElement &amp;&amp; this._addAttributeElement.parentNode)
+                this._addAttributeElement.parentNode.removeChild(this._addAttributeElement);
+            delete this._addAttributeElement;
+        }
+
+        if (!this._addAttributeElement &amp;&amp; this._hovered &amp;&amp; !this._editing) {
+            var span = document.createElement(&quot;span&quot;);
+            span.className = &quot;add-attribute&quot;;
+            span.textContent = &quot;\u2026&quot;;
+            span.addEventListener(&quot;dblclick&quot;, removeWhenEditing.bind(this), false);
+            this._addAttributeElement = span;
+
+            var tag = this.listItemElement.getElementsByClassName(&quot;webkit-html-tag&quot;)[0];
+            this._insertInLastAttributePosition(tag, span);
+        } else if (!this._hovered &amp;&amp; this._addAttributeElement) {
+            if (this._addAttributeElement.parentNode)
+                this._addAttributeElement.parentNode.removeChild(this._addAttributeElement);
+            delete this._addAttributeElement;
+        }
+    },
+    
</ins><span class="cx">     updateSelection: function()
</span><span class="cx">     {
</span><span class="cx">         var listItemElement = this.listItemElement;
</span><span class="lines">@@ -483,7 +514,7 @@
</span><span class="cx">         if (this._editing)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        if (this._startEditing(event))
</del><ins>+        if (this._startEditing(event, treeElement))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         if (this.treeOutline.panel) {
</span><span class="lines">@@ -495,8 +526,21 @@
</span><span class="cx">             this.expand();
</span><span class="cx">     },
</span><span class="cx"> 
</span><del>-    _startEditing: function(event)
</del><ins>+    _insertInLastAttributePosition: function(tag, node)
</ins><span class="cx">     {
</span><ins>+        if (tag.getElementsByClassName(&quot;webkit-html-attribute&quot;).length &gt; 0)
+            tag.insertBefore(node, tag.lastChild);
+        else {
+            var nodeName = tag.textContent.match(/^&lt;(.*?)&gt;$/)[1];
+            tag.textContent = '';
+            tag.appendChild(document.createTextNode('&lt;'+nodeName));
+            tag.appendChild(node);
+            tag.appendChild(document.createTextNode('&gt;'));
+        }
+    },
+
+    _startEditing: function(event, treeElement)
+    {
</ins><span class="cx">         if (this.treeOutline.focusedDOMNode != this.representedObject)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="lines">@@ -511,9 +555,37 @@
</span><span class="cx">         if (attribute)
</span><span class="cx">             return this._startEditingAttribute(attribute, event);
</span><span class="cx"> 
</span><ins>+        var newAttribute = event.target.enclosingNodeOrSelfWithClass(&quot;add-attribute&quot;);
+        if (newAttribute)
+            return this._addNewAttribute(event, treeElement);
+
</ins><span class="cx">         return false;
</span><span class="cx">     },
</span><span class="cx"> 
</span><ins>+    _addNewAttribute: function(event, treeElement)
+    {
+        var attr = document.createElement(&quot;span&quot;);
+        attr.className = &quot;webkit-html-attribute&quot;;
+        attr.style.marginLeft = &quot;2px&quot;; // overrides the .editing margin rule
+        attr.style.marginRight = &quot;2px&quot;; // overrides the .editing margin rule
+        var name = document.createElement(&quot;span&quot;);
+        name.className = &quot;webkit-html-attribute-name new-attribute&quot;;
+        name.textContent = &quot; &quot;;
+        var value = document.createElement(&quot;span&quot;);
+        value.className = &quot;webkit-html-attribute-value&quot;;
+        attr.appendChild(name);
+        attr.appendChild(value);
+
+        var tag = treeElement.listItemElement.getElementsByClassName(&quot;webkit-html-tag&quot;)[0];
+        this._insertInLastAttributePosition(tag, attr);
+
+        // Start editing the attr span and highlight it first
+        // NOTE: _startEditingAttribute only looks at the &quot;target&quot;, so we
+        // can fake an object here instead of passing the &quot;event&quot; with the
+        // wrong target element
+        return this._startEditingAttribute(attr, {target: attr});
+    },
+
</ins><span class="cx">     _startEditingAttribute: function(attribute, event)
</span><span class="cx">     {
</span><span class="cx">         if (WebInspector.isBeingEdited(attribute))
</span><span class="lines">@@ -571,7 +643,7 @@
</span><span class="cx">         parseContainerElement.innerHTML = &quot;&lt;span &quot; + newText + &quot;&gt;&lt;/span&gt;&quot;;
</span><span class="cx">         var parseElement = parseContainerElement.firstChild;
</span><span class="cx">         if (!parseElement || !parseElement.hasAttributes()) {
</span><del>-            this._editingCancelled(element, context);
</del><ins>+            this._editingCancelled(element, attributeName);
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendinspectorcss"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/inspector.css (46338 => 46339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/inspector.css        2009-07-24 08:31:33 UTC (rev 46338)
+++ trunk/WebCore/inspector/front-end/inspector.css        2009-07-24 08:33:04 UTC (rev 46339)
</span><span class="lines">@@ -644,6 +644,10 @@
</span><span class="cx">     margin-right: -6px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.console-group-messages .add-attribute {
+    display: none;
+}
+
</ins><span class="cx"> .console-formatted-object, .console-formatted-node {
</span><span class="cx">     position: relative;
</span><span class="cx">     display: inline-block;
</span><span class="lines">@@ -1095,6 +1099,11 @@
</span><span class="cx">     text-decoration: underline;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.add-attribute {
+    margin-left: 1px;
+    margin-right: 1px;
+}
+
</ins><span class="cx"> .placard {
</span><span class="cx">     position: relative;
</span><span class="cx">     margin-top: 1px;
</span></span></pre>
</div>
</div>

</body>
</html>