Changeset 217295 in webkit


Ignore:
Timestamp:
May 23, 2017 1:34:52 PM (7 years ago)
Author:
Devin Rousso
Message:

Web Inspector: use initialLayout for NetworkSidebarPanel
​https://bugs.webkit.org/show_bug.cgi?id=172470

Reviewed by Joseph Pecoraro.

  • UserInterface/Views/NetworkSidebarPanel.js:

(WebInspector.NetworkSidebarPanel):
(WebInspector.NetworkSidebarPanel.prototype.showDefaultContentView):
(WebInspector.NetworkSidebarPanel.prototype.initialLayout):
Don't create NetworkGridContentView until right before it is shown.

Location:
trunk/Source/WebInspectorUI
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r217271 r217295  
     12017-05-23  Devin Rousso  <drousso@apple.com>
     2
     3        Web Inspector: use initialLayout for NetworkSidebarPanel
     4        https://bugs.webkit.org/show_bug.cgi?id=172470
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * UserInterface/Views/NetworkSidebarPanel.js:
     9        (WebInspector.NetworkSidebarPanel):
     10        (WebInspector.NetworkSidebarPanel.prototype.showDefaultContentView):
     11        (WebInspector.NetworkSidebarPanel.prototype.initialLayout):
     12        Don't create NetworkGridContentView until right before it is shown.
     13
    1142017-05-23  Fujii Hironori  <Hironori.Fujii@sony.com>
    215

  • trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js

    r215630 r217295  
    3636        this.filterBar.placeholder = WebInspector.UIString("Filter Resource List");
    3737
     38        this.contentTreeOutline.element.classList.add("network-grid");
     39        this.contentTreeOutline.disclosureButtons = false;
     40    }
     41
     42    // Public
     43
     44    get minimumWidth()
     45    {
     46        return this._navigationBar.minimumWidth;
     47    }
     48
     49    showDefaultContentView()
     50    {
     51        if (!this._networkGridView)
     52            this._networkGridView = new WebInspector.NetworkGridContentView(null, {networkSidebarPanel: this});
     53
     54        this.contentBrowser.showContentView(this._networkGridView);
     55    }
     56
     57    canShowDifferentContentView()
     58    {
     59        if (this._clickedTreeElementGoToArrow)
     60            return true;
     61
     62        if (this.contentBrowser.currentContentView instanceof WebInspector.NetworkGridContentView)
     63            return false;
     64
     65        return !this.restoringState || !this._restoredShowingNetworkGridContentView;
     66    }
     67
     68    // Protected
     69
     70    initialLayout()
     71    {
    3872        this._navigationBar = new WebInspector.NavigationBar;
    3973        this.addSubview(this._navigationBar);
    … …  
    4478        this.element.appendChild(this._resourcesTitleBarElement);
    4579
    46         var scopeItemPrefix = "network-sidebar-";
    47         var scopeBarItems = [];
     80        let scopeItemPrefix = "network-sidebar-";
     81        let scopeBarItems = [];
    4882
    4983        scopeBarItems.push(new WebInspector.ScopeBarItem(scopeItemPrefix + "type-all", WebInspector.UIString("All Resources"), true));
    5084
    51         for (var key in WebInspector.Resource.Type) {
    52             var value = WebInspector.Resource.Type[key];
    53             var scopeBarItem = new WebInspector.ScopeBarItem(scopeItemPrefix + value, WebInspector.Resource.displayNameForType(value, true));
     85        for (let key in WebInspector.Resource.Type) {
     86            let value = WebInspector.Resource.Type[key];
     87            let scopeBarItem = new WebInspector.ScopeBarItem(scopeItemPrefix + value, WebInspector.Resource.displayNameForType(value, true));
    5488            scopeBarItem[WebInspector.NetworkSidebarPanel.ResourceTypeSymbol] = value;
    5589            scopeBarItems.push(scopeBarItem);
    … …  
    6195        this._navigationBar.addNavigationItem(this._scopeBar);
    6296
    63         this.contentTreeOutline.element.classList.add("network-grid");
    64         this.contentTreeOutline.disclosureButtons = false;
     97        WebInspector.timelineManager.persistentNetworkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
    6598
    6699        this.contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
    67 
    68         var networkTimeline = WebInspector.timelineManager.persistentNetworkTimeline;
    69         networkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
    70 
    71         this._networkGridView = new WebInspector.NetworkGridContentView(null, {networkSidebarPanel: this});
    72     }
    73 
    74     // Public
    75 
    76     get minimumWidth()
    77     {
    78         return this._navigationBar.minimumWidth;
    79     }
    80 
    81     showDefaultContentView()
    82     {
    83         this.contentBrowser.showContentView(this._networkGridView);
    84     }
    85 
    86     canShowDifferentContentView()
    87     {
    88         if (this._clickedTreeElementGoToArrow)
    89             return true;
    90 
    91         if (this.contentBrowser.currentContentView instanceof WebInspector.NetworkGridContentView)
    92             return false;
    93 
    94         return !this.restoringState || !this._restoredShowingNetworkGridContentView;
    95     }
    96 
    97     // Protected
     100        this._contentBrowserCurrentContentViewDidChange();
     101    }
    98102
    99103    saveStateToCookie(cookie)
Note: See TracChangeset for help on using the changeset viewer.