[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 43f067a832bc1142605e813d154fa9351aec978a
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 15 21:35:56 2009 +0000

    Fixes <https://bugs.webkit.org/show_bug.cgi?id=32578>.
    Web Inspector: No Need for ?="" now that we have context menus.
    
    Reviewed by Timothy Hatcher.
    
    Remove the toggleNewAttributeButton function and callers to it, as
    we don't need this behavior anymore, now that we have context menus.
    
    * inspector/front-end/ElementsTreeOutline.js:
    (WebInspector.ElementsTreeElement.prototype.set hovered):
    (WebInspector.ElementsTreeElement.prototype.toggleNewAttributeButton):
    (WebInspector.ElementsTreeElement.prototype._startEditing):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52168 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e3f3ec1..8074ff3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-15  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Fixes <https://bugs.webkit.org/show_bug.cgi?id=32578>.
+        Web Inspector: No Need for ?="" now that we have context menus.
+        
+        Remove the toggleNewAttributeButton function and callers to it, as
+        we don't need this behavior anymore, now that we have context menus.
+
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeElement.prototype.set hovered):
+        (WebInspector.ElementsTreeElement.prototype.toggleNewAttributeButton):
+        (WebInspector.ElementsTreeElement.prototype._startEditing):
+
 2009-12-15  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/inspector/front-end/ElementsTreeOutline.js b/WebCore/inspector/front-end/ElementsTreeOutline.js
index 91ee9bc..8bfae7a 100644
--- a/WebCore/inspector/front-end/ElementsTreeOutline.js
+++ b/WebCore/inspector/front-end/ElementsTreeOutline.js
@@ -335,15 +335,8 @@ WebInspector.ElementsTreeElement.prototype = {
             if (x) {
                 this.updateSelection();
                 this.listItemElement.addStyleClass("hovered");
-                if (this._canAddAttributes)
-                    this._pendingToggleNewAttribute = setTimeout(this.toggleNewAttributeButton.bind(this, true), 500);
             } else {
                 this.listItemElement.removeStyleClass("hovered");
-                if (this._pendingToggleNewAttribute) {
-                    clearTimeout(this._pendingToggleNewAttribute);
-                    delete this._pendingToggleNewAttribute;
-                }
-                this.toggleNewAttributeButton(false);
             }
         }
     },
@@ -368,30 +361,6 @@ WebInspector.ElementsTreeElement.prototype = {
         WebInspector.ObjectProxy.getPropertiesAsync(objectProxy, ["naturalHeight", "naturalWidth", "offsetHeight", "offsetWidth"], createTooltipThenCallback);
     },
 
-    toggleNewAttributeButton: function(visible)
-    {
-        function removeAddAttributeSpan()
-        {
-            if (this._addAttributeElement && this._addAttributeElement.parentNode)
-                this._addAttributeElement.parentNode.removeChild(this._addAttributeElement);
-            delete this._addAttributeElement;
-
-            this.updateSelection();
-        }
-
-        if (!this._addAttributeElement && visible && !this._editing) {
-            var span = document.createElement("span");
-            span.className = "add-attribute webkit-html-attribute-name";
-            span.textContent = " ?=\"\"";
-            span.addEventListener("dblclick", removeAddAttributeSpan.bind(this), false);
-            this._addAttributeElement = span;
-
-            var tag = this.listItemElement.getElementsByClassName("webkit-html-tag")[0];
-            this._insertInLastAttributePosition(tag, span);
-        } else if (!visible && this._addAttributeElement)
-            removeAddAttributeSpan.call(this);
-    },
-
     updateSelection: function()
     {
         var listItemElement = this.listItemElement;
@@ -650,7 +619,6 @@ WebInspector.ElementsTreeElement.prototype = {
         var listItem = this._listItemNode;
 
         if (this._canAddAttributes) {
-            this.toggleNewAttributeButton(false);
             var attribute = listItem.getElementsByClassName("webkit-html-attribute")[0];
             if (attribute)
                 return this._startEditingAttribute(attribute, attribute.getElementsByClassName("webkit-html-attribute-value")[0]);

-- 
WebKit Debian packaging