Changeset 180935 in webkit

Timestamp:

Mar 3, 2015 8:52:09 AM (9 years ago)

Author:

Brian Burg

Message:

Web Inspector: Console log level selector loses selection on reload
​https://bugs.webkit.org/show_bug.cgi?id=142199

Reviewed by Timothy Hatcher.

The selected items in the console scope bar were being saved as settings,
but the "All" scope is forcibly selected on reload due to a logic bug.

• UserInterface/Base/Main.js:

(WebInspector.showFullHeightConsole):
The scope bar may already have selected items restored from WebInspector.Settings.
Don't select a scope unless explicitly requested (i.e., clicking on dashboard buttons)
or if no scopes are selected at all. (In the latter case, "All" is the default scope.)

• UserInterface/Views/LogContentView.js:

(WebInspector.LogContentView): Don't specify a default value here to avoid trampling
settings. The "All" scope is selected by default in showFullHeightConsole if
nothing else is selected.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (3 diffs)
• UserInterface/Views/LogContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-03-03  Brian J. Burg  <burg@cs.washington.edu>
+
+        Web Inspector: Console log level selector loses selection on reload
+        https://bugs.webkit.org/show_bug.cgi?id=142199
+
+        Reviewed by Timothy Hatcher.
+
+        The selected items in the console scope bar were being saved as settings,
+        but the "All" scope is forcibly selected on reload due to a logic bug.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.showFullHeightConsole):
+        The scope bar may already have selected items restored from WebInspector.Settings.
+        Don't select a scope unless explicitly requested (i.e., clicking on dashboard buttons)
+        or if no scopes are selected at all. (In the latter case, "All" is the default scope.)
+
+        * UserInterface/Views/LogContentView.js:
+        (WebInspector.LogContentView): Don't specify a default value here to avoid trampling
+        settings. The "All" scope is selected by default in showFullHeightConsole if
+        nothing else is selected.
+
 2015-03-02  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -623 +623 @@
 };
 
-WebInspector.showFullHeightConsole = function(scope)
+WebInspector.showFullHeightConsole = function(requestedScope)
 {
     this.splitContentBrowser.element.classList.add("hidden");
@@ -629 +629 @@
     this._showingSplitConsoleSetting.value = false;
 
-    scope = scope || WebInspector.LogContentView.Scopes.All;
+    var scope = requestedScope || WebInspector.LogContentView.Scopes.All;
 
     // If the requested scope is already selected and the console is showing, then switch back to All.
@@ -635 +635 @@
         scope = WebInspector.LogContentView.Scopes.All;
 
-    this.consoleContentView.scopeBar.item(scope).selected = true;
+    if (requestedScope || !this.consoleContentView.scopeBar.selectedItems.length)
+        this.consoleContentView.scopeBar.item(scope).selected = true;
 
     if (!this.contentBrowser.currentContentView || this.contentBrowser.currentContentView !== this.consoleContentView) {

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

@@ -55 +55 @@
 
     var scopeBarItems = [
-        new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.All, WebInspector.UIString("All"), true),
+        new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.All, WebInspector.UIString("All")),
         new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.Errors, WebInspector.UIString("Errors")),
         new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.Warnings, WebInspector.UIString("Warnings")),