Changeset 194785 in webkit

Timestamp:

Jan 8, 2016, 1:33:59 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Initiated section of Resource Details Sidebar should not display as empty and should update as the list changes
​https://bugs.webkit.org/show_bug.cgi?id=152907
<rdar://problem/24109927>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-01-08
Reviewed by Timothy Hatcher.

• UserInterface/Models/Resource.js:

(WebInspector.Resource.prototype.addInitiatedResource):
Dispatch an event when the list of initiated resources changes.

• UserInterface/Views/ResourceDetailsSidebarPanel.js:

(WebInspector.ResourceDetailsSidebarPanel.prototype.set resource):
Add/remove event listeners for initiated resources changes to refresh
the related resources section.

(WebInspector.ResourceDetailsSidebarPanel.prototype.refresh):
(WebInspector.ResourceDetailsSidebarPanel.prototype._refreshURL):
(WebInspector.ResourceDetailsSidebarPanel.prototype._refreshRelatedResourcesSection):
Show/hide the related resources section depending on if we have something or not.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/Resource.js (modified) (2 diffs)
• UserInterface/Views/ResourceDetailsSidebarPanel.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-01-08  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Initiated section of Resource Details Sidebar should not display as empty and should update as the list changes
+        https://bugs.webkit.org/show_bug.cgi?id=152907
+        <rdar://problem/24109927>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Models/Resource.js:
+        (WebInspector.Resource.prototype.addInitiatedResource):
+        Dispatch an event when the list of initiated resources changes.
+
+        * UserInterface/Views/ResourceDetailsSidebarPanel.js:
+        (WebInspector.ResourceDetailsSidebarPanel.prototype.set resource):
+        Add/remove event listeners for initiated resources changes to refresh
+        the related resources section.
+
+        (WebInspector.ResourceDetailsSidebarPanel.prototype.refresh):
+        (WebInspector.ResourceDetailsSidebarPanel.prototype._refreshURL):
+        (WebInspector.ResourceDetailsSidebarPanel.prototype._refreshRelatedResourcesSection):
+        Show/hide the related resources section depending on if we have something or not.
+
 2016-01-08  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js

@@ -231 +231 @@
 
         this._initiatedResources.push(resource);
+
+        this.dispatchEventToListeners(WebInspector.Resource.Event.InitiatedResourcesDidChange);
     }
 
@@ -694 +696 @@
     SizeDidChange: "resource-size-did-change",
     TransferSizeDidChange: "resource-transfer-size-did-change",
-    CacheStatusDidChange: "resource-cached-did-change"
+    CacheStatusDidChange: "resource-cached-did-change",
+    InitiatedResourcesDidChange: "resource-initiated-resources-did-change",
 };
 

trunk/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js

@@ -158 +158 @@
             this._resource.removeEventListener(WebInspector.Resource.Event.SizeDidChange, this._refreshDecodedSize, this);
             this._resource.removeEventListener(WebInspector.Resource.Event.TransferSizeDidChange, this._refreshTransferSize, this);
+            this._resource.removeEventListener(WebInspector.Resource.Event.InitiatedResourcesDidChange, this._refreshRelatedResourcesSection, this);
         }
 
@@ -171 +172 @@
             this._resource.addEventListener(WebInspector.Resource.Event.SizeDidChange, this._refreshDecodedSize, this);
             this._resource.addEventListener(WebInspector.Resource.Event.TransferSizeDidChange, this._refreshTransferSize, this);
+            this._resource.addEventListener(WebInspector.Resource.Event.InitiatedResourcesDidChange, this._refreshRelatedResourcesSection, this);
         }
 
@@ -190 +192 @@
         this._refreshImageSizeSection();
         this._refreshRequestDataSection();
+        this._refreshRelatedResourcesSection();
     }
 
@@ -216 +219 @@
         }
 
-        let initiatorLocation = this._resource.initiatorSourceCodeLocation;
-        this._initiatorRow.value = initiatorLocation ? WebInspector.createSourceCodeLocationLink(initiatorLocation, true) : null;
-
-        let initiatedResources = this._resource.initiatedResources;
-        if (initiatedResources.length) {
-            let resourceLinkContainer = document.createElement("div");
-            for (let resource of initiatedResources)
-                resourceLinkContainer.appendChild(WebInspector.createResourceLink(resource));
-
-            this._initiatedRow.value = resourceLinkContainer;
-        } else
-            this._initiatedRow.value = null;
-
         if (urlComponents.queryString) {
             // Ensure the "Query Parameters" section is displayed, right after the "Request & Response" section.
@@ -242 +232 @@
     }
 
+    _refreshRelatedResourcesSection()
+    {
+        // Hide the section if we don't have anything to show.
+        let groups = this._locationSection.groups;
+        let isSectionVisible = groups.includes(this._relatedResourcesGroup);
+        if (!this._resource.initiatorSourceCodeLocation && !this._resource.initiatedResources.length) {
+            if (isSectionVisible) {
+                groups.remove(this._relatedResourcesGroup);
+                this._locationSection.groups = groups;
+            }
+            return;
+        }
+
+        if (!isSectionVisible) {
+            groups.push(this._relatedResourcesGroup);
+            this._locationSection.groups = groups;
+        }
+
+        let initiatorLocation = this._resource.initiatorSourceCodeLocation;
+        this._initiatorRow.value = initiatorLocation ? WebInspector.createSourceCodeLocationLink(initiatorLocation, true) : null;
+
+        let initiatedResources = this._resource.initiatedResources;
+        if (initiatedResources.length) {
+            let resourceLinkContainer = document.createElement("div");
+            for (let resource of initiatedResources)
+                resourceLinkContainer.appendChild(WebInspector.createResourceLink(resource));
+
+            this._initiatedRow.value = resourceLinkContainer;
+        } else
+            this._initiatedRow.value = null;
+    }
+
     _refreshResourceType()
     {