Changeset 162561 in webkit


Ignore:
Timestamp:
Jan 22, 2014 2:57:21 PM (10 years ago)
Author:
timothy@apple.com
Message:

Don't include a hidden Timeline selection in the navigation path components.

https://bugs.webkit.org/show_bug.cgi?id=127443

Reviewed by Joseph Pecoraro.

  • UserInterface/GeneralTreeElementPathComponent.js:

(WebInspector.GeneralTreeElementPathComponent.prototype.get previousSibling):
(WebInspector.GeneralTreeElementPathComponent.prototype.get nextSibling):
Skip hidden siblings.

  • UserInterface/OverviewTimelineView.js:

(WebInspector.OverviewTimelineView.prototype.updateLayout):
(WebInspector.OverviewTimelineView.prototype.get selectionPathComponents):
Don't include hidden selection and dispatch SelectionPathComponentsDidChange event if hidden changes.

  • UserInterface/TimelineContentView.js:

(WebInspector.TimelineContentView.prototype._timeRangeSelectionChanged):
Dispatch SelectionPathComponentsDidChange event if hidden changes on the selected tree element.

  • UserInterface/TimelineView.js:

(WebInspector.TimelineView.prototype.get selectionPathComponents):
Don't include hidden selection.

Location:
trunk/Source/WebInspectorUI
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebInspectorUI/ChangeLog

    r162560 r162561  
     12014-01-22  Timothy Hatcher  <timothy@apple.com>
     2
     3        Don't include a hidden Timeline selection in the navigation path components.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=127443
     6
     7        Reviewed by Joseph Pecoraro.
     8
     9        * UserInterface/GeneralTreeElementPathComponent.js:
     10        (WebInspector.GeneralTreeElementPathComponent.prototype.get previousSibling):
     11        (WebInspector.GeneralTreeElementPathComponent.prototype.get nextSibling):
     12        Skip hidden siblings.
     13
     14        * UserInterface/OverviewTimelineView.js:
     15        (WebInspector.OverviewTimelineView.prototype.updateLayout):
     16        (WebInspector.OverviewTimelineView.prototype.get selectionPathComponents):
     17        Don't include hidden selection and dispatch SelectionPathComponentsDidChange event if hidden changes.
     18
     19        * UserInterface/TimelineContentView.js:
     20        (WebInspector.TimelineContentView.prototype._timeRangeSelectionChanged):
     21        Dispatch SelectionPathComponentsDidChange event if hidden changes on the selected tree element.
     22
     23        * UserInterface/TimelineView.js:
     24        (WebInspector.TimelineView.prototype.get selectionPathComponents):
     25        Don't include hidden selection.
     26
    1272014-01-22  Timothy Hatcher  <timothy@apple.com>
    228
  • trunk/Source/WebInspectorUI/UserInterface/GeneralTreeElementPathComponent.js

    r151453 r162561  
    4343    get previousSibling()
    4444    {
    45         if (!this._generalTreeElement.previousSibling)
     45        var previousSibling = this._generalTreeElement.previousSibling;
     46        while (previousSibling && previousSibling.hidden)
     47            previousSibling = previousSibling.previousSibling;
     48
     49        if (!previousSibling)
    4650            return null;
    47         return new WebInspector.GeneralTreeElementPathComponent(this._generalTreeElement.previousSibling);
     51
     52        return new WebInspector.GeneralTreeElementPathComponent(previousSibling);
    4853    },
    4954
    5055    get nextSibling()
    5156    {
    52         if (!this._generalTreeElement.nextSibling)
     57        var nextSibling = this._generalTreeElement.nextSibling;
     58        while (nextSibling && nextSibling.hidden)
     59            nextSibling = nextSibling.nextSibling;
     60
     61        if (!nextSibling)
    5362            return null;
    54         return new WebInspector.GeneralTreeElementPathComponent(this._generalTreeElement.nextSibling);
     63
     64        return new WebInspector.GeneralTreeElementPathComponent(nextSibling);
    5565    },
    5666   
  • trunk/Source/WebInspectorUI/UserInterface/OverviewTimelineView.js

    r162560 r162561  
    102102
    103103        if (!this.currentTime !== oldCurrentTime) {
     104            var selectedTreeElement = this.navigationSidebarTreeOutline.selectedTreeElement;
     105            var selectionWasHidden = selectedTreeElement && selectedTreeElement.hidden;
     106
    104107            // Check the filters again since the current time change might have revealed this node. Start and end time changes are handled by TimelineContentView.
    105108            WebInspector.timelineSidebarPanel.updateFilter();
     109
     110            if (selectedTreeElement && selectedTreeElement.hidden !== selectionWasHidden)
     111                this.dispatchEventToListeners(WebInspector.TimelineView.Event.SelectionPathComponentsDidChange);
    106112        }
    107113
     
    124130            if (!treeElement)
    125131                break;
     132
     133            if (treeElement.hidden)
     134                return null;
    126135
    127136            var pathComponent = new WebInspector.GeneralTreeElementPathComponent(treeElement);
  • trunk/Source/WebInspectorUI/UserInterface/TimelineContentView.js

    r162560 r162561  
    405405
    406406        // Delay until the next frame to stay in sync with the current timeline view's time-based layout changes.
    407         requestAnimationFrame(function() { WebInspector.timelineSidebarPanel.updateFilter(); });
     407        requestAnimationFrame(function() {
     408            var selectedTreeElement = this._currentTimelineView && this._currentTimelineView.navigationSidebarTreeOutline ? this._currentTimelineView.navigationSidebarTreeOutline.selectedTreeElement : null;
     409            var selectionWasHidden = selectedTreeElement && selectedTreeElement.hidden;
     410
     411            WebInspector.timelineSidebarPanel.updateFilter();
     412
     413            if (selectedTreeElement && selectedTreeElement.hidden !== selectionWasHidden)
     414                this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
     415        }.bind(this));
    408416    }
    409417};
  • trunk/Source/WebInspectorUI/UserInterface/TimelineView.js

    r162527 r162561  
    6464    get selectionPathComponents()
    6565    {
    66         if (!this._contentTreeOutline.selectedTreeElement)
     66        if (!this._contentTreeOutline.selectedTreeElement || this._contentTreeOutline.selectedTreeElement.hidden)
    6767            return null;
    6868
Note: See TracChangeset for help on using the changeset viewer.