Changeset 238502 in webkit

Timestamp:

Nov 26, 2018, 11:01:04 AM (8 years ago)

Author:

Devin Rousso

Message:

Web Inspector: "No Filter Results" in navigation sidebar should have a button to clear filters
​https://bugs.webkit.org/show_bug.cgi?id=191916

Reviewed by Joseph Pecoraro.

• UserInterface/Views/NavigationSidebarPanel.js:

(WI.NavigationSidebarPanel.prototype.resetFilter): Added.
(WI.NavigationSidebarPanel.prototype._checkForEmptyFilterResults.checkTreeOutlineForEmptyFilterResults):

• UserInterface/Views/FilterBar.js:

(WI.FilterBar.prototype.clear):

• UserInterface/Views/FilterBarButton.js:

(WI.FilterBarButton.prototype.toggle):

• UserInterface/Views/ResourceSidebarPanel.js:

(WI.ResourceSidebarPanel.prototype.resetFilter): Added.

• UserInterface/Views/StorageSidebarPanel.js:

(WI.StorageSidebarPanel.prototype.resetFilter): Added.

• UserInterface/Views/AuditTestContentView.js:

(WI.AuditTestContentView.prototype.showFilteredPlaceholder):

• UserInterface/Views/NetworkTableContentView.js:

(WI.NetworkTableContentView.prototype._showEmptyFilterResultsMessage):

• UserInterface/Views/Main.css:

(.message-text-view > .message + button): Added.

• Localizations/en.lproj/localizedStrings.js:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Views/AuditTestContentView.js (modified) (1 diff)
• UserInterface/Views/FilterBar.js (modified) (1 diff)
• UserInterface/Views/FilterBarButton.js (modified) (1 diff)
• UserInterface/Views/Main.css (modified) (1 diff)
• UserInterface/Views/NavigationSidebarPanel.js (modified) (2 diffs)
• UserInterface/Views/NetworkTableContentView.js (modified) (1 diff)
• UserInterface/Views/ResourceSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/StorageSidebarPanel.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-11-26  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: "No Filter Results" in navigation sidebar should have a button to clear filters
+        https://bugs.webkit.org/show_bug.cgi?id=191916
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/NavigationSidebarPanel.js:
+        (WI.NavigationSidebarPanel.prototype.resetFilter): Added.
+        (WI.NavigationSidebarPanel.prototype._checkForEmptyFilterResults.checkTreeOutlineForEmptyFilterResults):
+
+        * UserInterface/Views/FilterBar.js:
+        (WI.FilterBar.prototype.clear):
+
+        * UserInterface/Views/FilterBarButton.js:
+        (WI.FilterBarButton.prototype.toggle):
+
+        * UserInterface/Views/ResourceSidebarPanel.js:
+        (WI.ResourceSidebarPanel.prototype.resetFilter): Added.
+        * UserInterface/Views/StorageSidebarPanel.js:
+        (WI.StorageSidebarPanel.prototype.resetFilter): Added.
+
+        * UserInterface/Views/AuditTestContentView.js:
+        (WI.AuditTestContentView.prototype.showFilteredPlaceholder):
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView.prototype._showEmptyFilterResultsMessage):
+
+        * UserInterface/Views/Main.css:
+        (.message-text-view > .message + button): Added.
+
+        * Localizations/en.lproj/localizedStrings.js:
+
 2018-11-26  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -187 +187 @@
 localizedStrings["Children"] = "Children";
 localizedStrings["Classes"] = "Classes";
+localizedStrings["Clear Filters"] = "Clear Filters";
 localizedStrings["Clear Log"] = "Clear Log";
 localizedStrings["Clear Network Items (%s)"] = "Clear Network Items (%s)";
 localizedStrings["Clear Timeline (%s)"] = "Clear Timeline (%s)";
-localizedStrings["Clear filters"] = "Clear filters";
 localizedStrings["Clear focus"] = "Clear focus";
 localizedStrings["Clear log (%s or %s)"] = "Clear log (%s or %s)";

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

@@ -205 +205 @@
 
             let buttonElement = this.placeholderElement.appendChild(document.createElement("button"));
-            buttonElement.textContent = WI.UIString("Clear filters");
+            buttonElement.textContent = WI.UIString("Clear Filters");
             buttonElement.addEventListener("click", () => {
                 this.resetFilter();

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

@@ -119 +119 @@
     clear()
     {
-        this._inputField.value = "";
+        this._filterFunctionsMap.clear();
+        this.filters = null;
+
+        // Only toggle the `WI.FilterBarButton`s after clearing the function map, as otherwise each
+        // toggle will fire another WI.FilterBar.Event.FilterDidChange event.
+        for (let navigationItem of this._filtersNavigationBar.navigationItems) {
+            if (navigationItem instanceof WI.FilterBarButton)
+                navigationItem.toggle(false);
+        }
+
         this._inputField.value = null; // Get the placeholder to show again.
-        this._lastFilterValue = this.filters;
     }
 

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

@@ -44 +44 @@
     }
 
-    toggle()
+    toggle(value)
     {
-        this.activated = !this.activated;
+        this.activated = value === undefined ? !this.activated : value;
         this._activatedSetting.value = this.activated;
         this.dispatchEventToListeners(WI.FilterBarButton.Event.ActivatedStateToggled);

trunk/Source/WebInspectorUI/UserInterface/Views/Main.css

@@ -190 +190 @@
 }
 
+.message-text-view > .message + button {
+    margin-bottom: 15px;
+}
+
 .message-text-view .navigation-item-help {
     display: block;

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

@@ -309 +309 @@
     }
 
+    resetFilter()
+    {
+        this._filterBar.clear();
+    }
+
     shouldFilterPopulate()
     {
@@ -514 +519 @@
             }
 
+            let message = WI.createMessageTextView(WI.UIString("No Filter Results"));
+
+            let buttonElement = message.appendChild(document.createElement("button"));
+            buttonElement.textContent = WI.UIString("Clear Filters");
+            buttonElement.addEventListener("click", () => {
+                this.resetFilter();
+            });
+
             // All top level tree elements are hidden, so filtering hid everything. Show a message.
-            this.showEmptyContentPlaceholder(WI.UIString("No Filter Results"), treeOutline);
+            this.showEmptyContentPlaceholder(message, treeOutline);
             this._emptyFilterResults.set(treeOutline, true);
         }

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

@@ -1373 +1373 @@
         if (!this._emptyFilterResultsMessageElement) {
             let buttonElement = document.createElement("button");
-            buttonElement.textContent = WI.UIString("Clear filters");
+            buttonElement.textContent = WI.UIString("Clear Filters");
             buttonElement.addEventListener("click", () => { this._resetFilters(); });
 

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

@@ -209 +209 @@
     }
 
+    resetFilter()
+    {
+        this._scopeBar.resetToDefault();
+
+        super.resetFilter();
+    }
+
     hasCustomFilters()
     {

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

@@ -129 +129 @@
     // Protected
 
+    resetFilter()
+    {
+        this._scopeBar.resetToDefault();
+
+        super.resetFilter();
+    }
+
     hasCustomFilters()
     {