Web Inspector: Replace last use of ObjectPropertiesSection with ObjectTreeView
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Mar 2015 03:26:58 +0000 (03:26 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Mar 2015 03:26:58 +0000 (03:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142834

Reviewed by Timothy Hatcher.

* UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
(WebInspector.DOMNodeDetailsSidebarPanel.prototype._refreshProperties):
Use properties only ObjectTreeView instead of ObjectPropertiesSection.
This doesn't fix the functionality issues, but fixes the appearance.

* UserInterface/Views/DetailsSection.css:
(.details-section > .content > .group:first-child > .row.simple:first-child > *): Deleted.
(body.mac-platform.legacy .details-section > .content > .group:first-child > .row.simple:first-child > *): Deleted.
(.details-section > .content > .group > .row.properties:not(.empty)): Deleted.
(body.mac-platform.legacy .details-section > .content > .group > .row.properties:not(.empty)): Deleted.
Re-add back the small padding at the top of sections. This actually
broke padding in a few sections (Event Listeners) at the expense
of eliminating a few pixels of whitespace at the top of other sections.
We should focus on addressing the extra whitespace separately.

* UserInterface/Main.html:
* UserInterface/Views/ObjectPropertiesSection.js: Removed.
* UserInterface/Views/TypePropertiesSection.js:
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
Remove new unused class.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181723 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Main.html
Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js
Source/WebInspectorUI/UserInterface/Views/DetailsSection.css
Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesSection.js [deleted file]
Source/WebInspectorUI/UserInterface/Views/TypePropertiesSection.js
Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj
Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters

index b44bb47..c7e7473 100644 (file)
@@ -1,5 +1,34 @@
 2015-03-18  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Replace last use of ObjectPropertiesSection with ObjectTreeView
+        https://bugs.webkit.org/show_bug.cgi?id=142834
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
+        (WebInspector.DOMNodeDetailsSidebarPanel.prototype._refreshProperties):
+        Use properties only ObjectTreeView instead of ObjectPropertiesSection.
+        This doesn't fix the functionality issues, but fixes the appearance.
+
+        * UserInterface/Views/DetailsSection.css:
+        (.details-section > .content > .group:first-child > .row.simple:first-child > *): Deleted.
+        (body.mac-platform.legacy .details-section > .content > .group:first-child > .row.simple:first-child > *): Deleted.
+        (.details-section > .content > .group > .row.properties:not(.empty)): Deleted.
+        (body.mac-platform.legacy .details-section > .content > .group > .row.properties:not(.empty)): Deleted.
+        Re-add back the small padding at the top of sections. This actually
+        broke padding in a few sections (Event Listeners) at the expense
+        of eliminating a few pixels of whitespace at the top of other sections.
+        We should focus on addressing the extra whitespace separately.
+
+        * UserInterface/Main.html:
+        * UserInterface/Views/ObjectPropertiesSection.js: Removed.
+        * UserInterface/Views/TypePropertiesSection.js:
+        * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
+        * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
+        Remove new unused class.
+
+2015-03-18  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Debugger Popovers and Probes should use FormattedValue/ObjectTreeView instead of Custom/ObjectPropertiesSection
         https://bugs.webkit.org/show_bug.cgi?id=142830
 
index f200447..b0dc22a 100644 (file)
     <script src="Views/NetworkTimelineOverviewGraph.js"></script>
     <script src="Views/NetworkTimelineView.js"></script>
     <script src="Views/ObjectPreviewView.js"></script>
-    <script src="Views/ObjectPropertiesSection.js"></script>
     <script src="Views/ObjectTreeArrayIndexTreeElement.js"></script>
     <script src="Views/ObjectTreeMapEntryTreeElement.js"></script>
     <script src="Views/ObjectTreePropertyTreeElement.js"></script>
index 89d0d36..8c11e89 100644 (file)
@@ -203,10 +203,13 @@ WebInspector.DOMNodeDetailsSidebarPanel.prototype = {
                 else if (title === "Object")
                     title = title + WebInspector.UIString(" (Prototype)");
 
-                var propertiesSection = new WebInspector.ObjectPropertiesSection(prototype);
+                // FIXME: <https://webkit.org/b/142833> Web Inspector: Node Details Sidebar Properties Section has "undefined" for all prototype properties
+
+                var objectTree = new WebInspector.ObjectTreeView(prototype, WebInspector.ObjectTreeView.Mode.Properties);
+                objectTree.showOnlyProperties();
 
                 var detailsSection = new WebInspector.DetailsSection(prototype.description.hash + "-prototype-properties", title, null, null, true);
-                detailsSection.groups[0].rows = [new WebInspector.DetailsSectionPropertiesRow(propertiesSection)];
+                detailsSection.groups[0].rows = [new WebInspector.DetailsSectionPropertiesRow(objectTree)];
 
                 element.appendChild(detailsSection.element);
             }
index 12dbaae..3db0488 100644 (file)
@@ -257,14 +257,6 @@ body.mac-platform.legacy .details-section > .content > .group:matches(:nth-child
     padding: 5px 4px 2px;
 }
 
-.details-section > .content > .group:first-child > .row.simple:first-child > * {
-    padding: 0px 4px 2px 4px;
-}
-
-body.mac-platform.legacy .details-section > .content > .group:first-child > .row.simple:first-child > * {
-    padding: 5px 4px 2px;
-}
-
 .details-section > .content > .group > .row.simple > .label {
     color: rgb(51, 51, 51);
 
@@ -309,10 +301,6 @@ body.mac-platform.legacy .details-section > .content > .group > .row:matches(.em
 }
 
 .details-section > .content > .group > .row.properties:not(.empty) {
-    padding: 0 4px 6px 4px;
-}
-
-body.mac-platform.legacy .details-section > .content > .group > .row.properties:not(.empty) {
     padding: 4px 6px;
 }
 
diff --git a/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesSection.js b/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesSection.js
deleted file mode 100644 (file)
index 63d0b96..0000000
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.ObjectPropertiesSection = function(object, title, subtitle, emptyPlaceholder, getAllProperties, extraProperties, treeElementConstructor)
-{
-    this.emptyPlaceholder = (emptyPlaceholder || WebInspector.UIString("No Properties"));
-    this.object = object;
-    this.getAllProperties = getAllProperties;
-    this.extraProperties = extraProperties;
-    this.treeElementConstructor = treeElementConstructor || WebInspector.ObjectPropertyTreeElement;
-    this.editable = true;
-
-    WebInspector.PropertiesSection.call(this, title, subtitle);
-};
-
-WebInspector.ObjectPropertiesSection.prototype = {
-    onpopulate: function()
-    {
-        this.update();
-    },
-
-    update: function()
-    {
-        function callback(properties)
-        {
-            if (!properties)
-                return;
-
-            this.updateProperties(properties);
-        }
-
-        if (this.getAllProperties)
-            this.object.deprecatedGetAllProperties(callback.bind(this));
-        else
-            this.object.deprecatedGetDisplayableProperties(callback.bind(this));
-    },
-
-    updateProperties: function(properties, rootTreeElementConstructor, rootPropertyComparer)
-    {
-        if (!rootTreeElementConstructor)
-            rootTreeElementConstructor = this.treeElementConstructor;
-
-        if (!rootPropertyComparer)
-            rootPropertyComparer = WebInspector.ObjectPropertiesSection.CompareProperties;
-
-        if (this.extraProperties)
-            for (var i = 0; i < this.extraProperties.length; ++i)
-                properties.push(this.extraProperties[i]);
-
-        properties.sort(rootPropertyComparer);
-
-        this.propertiesTreeOutline.removeChildren();
-
-        for (var i = 0; i < properties.length; ++i) {
-            properties[i].parentObject = this.object;
-            this.propertiesTreeOutline.appendChild(new rootTreeElementConstructor(properties[i]));
-        }
-
-        if (!this.propertiesTreeOutline.children.length) {
-            var title = document.createElement("div");
-            title.className = "info";
-            title.textContent = this.emptyPlaceholder;
-            var infoElement = new TreeElement(title, null, false);
-            this.propertiesTreeOutline.appendChild(infoElement);
-        }
-        this.propertiesForTest = properties;
-
-        if (this.object.isCollectionType())
-            this.propertiesTreeOutline.appendChild(new WebInspector.CollectionEntriesMainTreeElement(this.object));
-
-        this.dispatchEventToListeners(WebInspector.Section.Event.VisibleContentDidChange);
-    }
-};
-
-WebInspector.ObjectPropertiesSection.prototype.__proto__ = WebInspector.PropertiesSection.prototype;
-
-WebInspector.ObjectPropertiesSection.CompareProperties = function(propertyA, propertyB)
-{
-    var a = propertyA.name;
-    var b = propertyB.name;
-    if (a === "__proto__")
-        return 1;
-    if (b === "__proto__")
-        return -1;
-
-    // if used elsewhere make sure to
-    //  - convert a and b to strings (not needed here, properties are all strings)
-    //  - check if a == b (not needed here, no two properties can be the same)
-
-    var diff = 0;
-    var chunk = /^\d+|^\D+/;
-    var chunka, chunkb, anum, bnum;
-    while (diff === 0) {
-        if (!a && b)
-            return -1;
-        if (!b && a)
-            return 1;
-        chunka = a.match(chunk)[0];
-        chunkb = b.match(chunk)[0];
-        anum = !isNaN(chunka);
-        bnum = !isNaN(chunkb);
-        if (anum && !bnum)
-            return -1;
-        if (bnum && !anum)
-            return 1;
-        if (anum && bnum) {
-            diff = chunka - chunkb;
-            if (diff === 0 && chunka.length !== chunkb.length) {
-                if (!+chunka && !+chunkb) // chunks are strings of all 0s (special case)
-                    return chunka.length - chunkb.length;
-                else
-                    return chunkb.length - chunka.length;
-            }
-        } else if (chunka !== chunkb)
-            return (chunka < chunkb) ? -1 : 1;
-        a = a.substring(chunka.length);
-        b = b.substring(chunkb.length);
-    }
-    return diff;
-};
-
-WebInspector.ObjectPropertyTreeElement = function(property)
-{
-    this.property = property;
-
-    // Pass an empty title, the title gets made later in onattach.
-    TreeElement.call(this, "", null, false);
-    this.toggleOnClick = true;
-    this.selectable = false;
-};
-
-WebInspector.ObjectPropertyTreeElement.prototype = {
-    onpopulate: function()
-    {
-        if (this.children.length && !this.shouldRefreshChildren)
-            return;
-
-        function callback(properties) {
-            this.removeChildren();
-            if (!properties)
-                return;
-
-            properties.sort(WebInspector.ObjectPropertiesSection.CompareProperties);
-            for (var i = 0; i < properties.length; ++i)
-                this.appendChild(new this.treeOutline.section.treeElementConstructor(properties[i]));
-
-            if (this.property.value.isCollectionType())
-                this.appendChild(new WebInspector.CollectionEntriesMainTreeElement(this.property.value));
-        };
-
-        if (this.property.name === "__proto__")
-            this.property.value.deprecatedGetOwnProperties(callback.bind(this));
-        else
-            this.property.value.deprecatedGetDisplayableProperties(callback.bind(this));
-    },
-
-    ondblclick: function(event)
-    {
-        if (this.property.writable)
-            this.startEditing();
-    },
-
-    onattach: function()
-    {
-        this.update();
-    },
-
-    update: function()
-    {
-        this.nameElement = document.createElement("span");
-        this.nameElement.className = "name";
-        this.nameElement.textContent = this.property.name;
-        if (!this.property.enumerable && (!this.parent.root || !this.treeOutline.section.dontHighlightNonEnumerablePropertiesAtTopLevel))
-            this.nameElement.classList.add("dimmed");
-
-        var separatorElement = document.createElement("span");
-        separatorElement.className = "separator";
-        separatorElement.textContent = ": ";
-
-        this.valueElement = document.createElement("span");
-        this.valueElement.className = "value";
-
-        var description = this.property.value.description;
-        // Render \n as a nice unicode cr symbol.
-        if (this.property.wasThrown)
-            this.valueElement.textContent = "[Exception: " + description + "]";
-        else if (this.property.value.type === "string" && typeof description === "string") {
-            this.valueElement.textContent = "\"" + description.replace(/\n/g, "\u21B5").replace(/"/g, "\\\"") + "\"";
-            this.valueElement._originalTextContent = "\"" + description + "\"";
-        } else if (this.property.value.type === "function" && typeof description === "string") {
-            this.valueElement.textContent = /.*/.exec(description)[0].replace(/ +$/g, "");
-            this.valueElement._originalTextContent = description;
-        } else
-            this.valueElement.textContent = description;
-
-        if (this.property.value.type === "function")
-            this.valueElement.addEventListener("contextmenu", this._functionContextMenuEventFired.bind(this), false);
-
-        if (this.property.wasThrown)
-            this.valueElement.classList.add("error");
-        if (this.property.value.subtype)
-            this.valueElement.classList.add("formatted-" + this.property.value.subtype);
-        else if (this.property.value.type)
-            this.valueElement.classList.add("formatted-" + this.property.value.type);
-        if (this.property.value.subtype === "node")
-            this.valueElement.addEventListener("contextmenu", this._contextMenuEventFired.bind(this), false);
-
-        this.listItemElement.removeChildren();
-
-        this.listItemElement.appendChild(this.nameElement);
-        this.listItemElement.appendChild(separatorElement);
-        this.listItemElement.appendChild(this.valueElement);
-        this.hasChildren = this.property.value.hasChildren && !this.property.wasThrown;
-    },
-
-    _contextMenuEventFired: function(event)
-    {
-        function selectNode(nodeId)
-        {
-            if (nodeId)
-                WebInspector.domTreeManager.inspectElement(nodeId);
-        }
-
-        function revealElement()
-        {
-            this.property.value.pushNodeToFrontend(selectNode);
-        }
-
-        var contextMenu = new WebInspector.ContextMenu(event);
-        contextMenu.appendItem(WebInspector.UIString("Reveal in DOM Tree"), revealElement.bind(this));
-        contextMenu.show();
-    },
-
-    _functionContextMenuEventFired: function(event)
-    {
-        function didGetLocation(error, response)
-        {
-            if (error)
-                return;
-
-            var location = response.location;
-            var sourceCode = WebInspector.debuggerManager.scriptForIdentifier(location.scriptId);
-            if (!sourceCode)
-                return;
-
-            var sourceCodeLocation = sourceCode.createSourceCodeLocation(location.lineNumber, location.columnNumber || 0);
-            WebInspector.resourceSidebarPanel.showSourceCodeLocation(sourceCodeLocation);
-        }
-
-        function revealFunction()
-        {
-            DebuggerAgent.getFunctionDetails(this.property.value.objectId, didGetLocation);
-        }
-
-        var contextMenu = new WebInspector.ContextMenu(event);
-        contextMenu.appendItem(WebInspector.UIString("Jump to Definition"), revealFunction.bind(this));
-        contextMenu.show();
-    },
-
-    updateSiblings: function()
-    {
-        if (this.parent.root)
-            this.treeOutline.section.update();
-        else
-            this.parent.shouldRefreshChildren = true;
-    },
-
-    startEditing: function()
-    {
-        if (WebInspector.isBeingEdited(this.valueElement) || !this.treeOutline.section.editable)
-            return;
-
-        var context = { expanded: this.expanded };
-
-        // Lie about our children to prevent expanding on double click and to collapse subproperties.
-        this.hasChildren = false;
-
-        this.listItemElement.classList.add("editing-sub-part");
-
-        // Edit original source.
-        if (typeof this.valueElement._originalTextContent === "string")
-            this.valueElement.textContent = this.valueElement._originalTextContent;
-
-        var config = new WebInspector.EditingConfig(this.editingCommitted.bind(this), this.editingCancelled.bind(this), context);
-        WebInspector.startEditing(this.valueElement, config);
-    },
-
-    editingEnded: function(context)
-    {
-        this.listItemElement.scrollLeft = 0;
-        this.listItemElement.classList.remove("editing-sub-part");
-        if (context.expanded)
-            this.expand();
-    },
-
-    editingCancelled: function(element, context)
-    {
-        this.update();
-        this.editingEnded(context);
-    },
-
-    editingCommitted: function(element, userInput, previousContent, context)
-    {
-        if (userInput === previousContent)
-            return this.editingCancelled(element, context); // nothing changed, so cancel
-
-        this.applyExpression(userInput, true);
-
-        this.editingEnded(context);
-    },
-
-    applyExpression: function(expression, updateInterface)
-    {
-        expression = expression.trim();
-        var expressionLength = expression.length;
-        function callback(error)
-        {
-            if (!updateInterface)
-                return;
-
-            if (error)
-                this.update();
-
-            if (!expressionLength) {
-                // The property was deleted, so remove this tree element.
-                this.parent.removeChild(this);
-            } else {
-                // Call updateSiblings since their value might be based on the value that just changed.
-                this.updateSiblings();
-            }
-        }
-        this.property.parentObject.setPropertyValue(this.property.name, expression.trim(), callback.bind(this));
-    }
-};
-
-WebInspector.ObjectPropertyTreeElement.prototype.__proto__ = TreeElement.prototype;
-
-WebInspector.CollectionEntriesMainTreeElement = function(remoteObject)
-{
-    TreeElement.call(this, "<entries>", null, false);
-
-    console.assert(remoteObject);
-
-    this._remoteObject = remoteObject;
-    this._requestingEntries = false;
-    this._trackingEntries = false;
-
-    this.toggleOnClick = true;
-    this.selectable = false;
-    this.hasChildren = true;
-    this.expand();
-
-    // FIXME: When a parent TreeElement is collapsed, we do not get a chance
-    // to releaseWeakCollectionEntries. We should.
-}
-
-WebInspector.CollectionEntriesMainTreeElement.prototype = {
-    constructor: WebInspector.CollectionEntriesMainTreeElement,
-    __proto__: TreeElement.prototype,
-
-    onexpand: function()
-    {
-        if (this.children.length && !this.shouldRefreshChildren)
-            return;
-
-        if (this._requestingEntries)
-            return;
-
-        this._requestingEntries = true;
-
-        function callback(entries) {
-            this._requestingEntries = false;
-
-            this.removeChildren();
-
-            if (!entries || !entries.length) {
-                this.appendChild(new WebInspector.EmptyCollectionTreeElement);
-                return;
-            }
-
-            this._trackWeakEntries();
-
-            for (var i = 0; i < entries.length; ++i) {
-                var entry = entries[i];
-                if (entry.key)
-                    this.appendChild(new WebInspector.CollectionEntryTreeElement(entry, i));
-                else {
-                    this.appendChild(new WebInspector.ObjectPropertyTreeElement({
-                        name: "" + i,
-                        value: entry.value,
-                        enumerable: true,
-                        writable: false,
-                    }));
-                }
-            }
-        }
-        
-        this._remoteObject.getCollectionEntries(0, 100, callback.bind(this));
-    },
-
-    oncollapse: function()
-    {
-        this._untrackWeakEntries();
-    },
-
-    ondetach: function()
-    {
-        this._untrackWeakEntries();
-    },
-
-    // Private.
-
-    _trackWeakEntries: function()
-    {
-        if (!this._remoteObject.isWeakCollection())
-            return;
-
-        if (this._trackingEntries)
-            return;
-
-        this._trackingEntries = true;
-
-        WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.Cleared, this._untrackWeakEntries, this);
-        WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._untrackWeakEntries, this);
-        WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.SessionStarted, this._untrackWeakEntries, this);
-    },
-
-    _untrackWeakEntries: function()
-    {
-        if (!this._remoteObject.isWeakCollection())
-            return;
-
-        if (!this._trackingEntries)
-            return;
-
-        this._trackingEntries = false;
-
-        this._remoteObject.releaseWeakCollectionEntries();
-
-        WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.Cleared, this._untrackWeakEntries, this);
-        WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._untrackWeakEntries, this);
-        WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.SessionStarted, this._untrackWeakEntries, this);
-
-        this.removeChildren();
-
-        if (this.expanded)
-            this.collapse();
-    },
-}
-
-WebInspector.CollectionEntryTreeElement = function(entry, index)
-{
-    TreeElement.call(this, "", null, false);
-
-    console.assert(entry);
-
-    this._name = "" + index;
-    this._key = entry.key;
-    this._value = entry.value;
-
-    this.toggleOnClick = true;
-    this.selectable = false;
-    this.hasChildren = true;
-}
-
-WebInspector.CollectionEntryTreeElement.prototype = {
-    constructor: WebInspector.CollectionEntryTreeElement,
-    __proto__: TreeElement.prototype,
-
-    onpopulate: function()
-    {
-        if (this.children.length && !this.shouldRefreshChildren)
-            return;
-
-        this.appendChild(new WebInspector.ObjectPropertyTreeElement({
-            name: "key",
-            value: this._key,
-            enumerable: true,
-            writable: false,
-        }));
-
-        this.appendChild(new WebInspector.ObjectPropertyTreeElement({
-            name: "value",
-            value: this._value,
-            enumerable: true,
-            writable: false,
-        }));
-    },
-
-    onattach: function()
-    {
-        var nameElement = document.createElement("span");
-        nameElement.className = "name";
-        nameElement.textContent = "" + this._name;
-
-        var separatorElement = document.createElement("span");
-        separatorElement.className = "separator";
-        separatorElement.textContent = ": ";
-
-        var valueElement = document.createElement("span");
-        valueElement.className = "value";
-        valueElement.textContent = "{" + this._key.description + " => " + this._value.description + "}";
-
-        this.listItemElement.removeChildren();
-        this.listItemElement.appendChild(nameElement);
-        this.listItemElement.appendChild(separatorElement);
-        this.listItemElement.appendChild(valueElement);
-    }
-}
-
-WebInspector.EmptyCollectionTreeElement = function()
-{
-    TreeElement.call(this, WebInspector.UIString("Empty Collection"), null, false);
-
-    this.selectable = false;
-}
-
-WebInspector.EmptyCollectionTreeElement.prototype = {
-    constructor: WebInspector.EmptyCollectionTreeElement,
-    __proto__: TreeElement.prototype
-}
index 53a5029..94604c7 100644 (file)
@@ -79,7 +79,7 @@ WebInspector.TypePropertiesSection.prototype = {
     }
 };
 
-// This is mostly identical to ObjectPropertiesSection.compareProperties.
+// This is mostly identical to ObjectTreeView.compareProperties.
 // But this checks for equality because we can have two objects named the same thing.
 WebInspector.TypePropertiesSection.PropertyComparator = function(propertyA, propertyB)
 {
index eb4c8f6..f529543 100644 (file)
     <None Include="..\UserInterface\NetworkObserver.js" />
     <None Include="..\UserInterface\NetworkTimeline.css" />
     <None Include="..\UserInterface\Object.js" />
-    <None Include="..\UserInterface\ObjectPropertiesSection.js" />
     <None Include="..\UserInterface\PageObserver.js" />
     <None Include="..\UserInterface\PathComponentIcons.css" />
     <None Include="..\UserInterface\Popover.css" />
index 916dc22..6d17aa8 100644 (file)
     <None Include="..\UserInterface\Object.js">
       <Filter>UserInterface</Filter>
     </None>
-    <None Include="..\UserInterface\ObjectPropertiesSection.js">
-      <Filter>UserInterface</Filter>
-    </None>
     <None Include="..\UserInterface\PageObserver.js">
       <Filter>UserInterface</Filter>
     </None>