Changeset 162561 in webkit
- Timestamp:
- Jan 22, 2014 2:57:21 PM (10 years ago)
- Location:
- trunk/Source/WebInspectorUI
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebInspectorUI/ChangeLog
r162560 r162561 1 2014-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 1 27 2014-01-22 Timothy Hatcher <timothy@apple.com> 2 28 -
trunk/Source/WebInspectorUI/UserInterface/GeneralTreeElementPathComponent.js
r151453 r162561 43 43 get previousSibling() 44 44 { 45 if (!this._generalTreeElement.previousSibling) 45 var previousSibling = this._generalTreeElement.previousSibling; 46 while (previousSibling && previousSibling.hidden) 47 previousSibling = previousSibling.previousSibling; 48 49 if (!previousSibling) 46 50 return null; 47 return new WebInspector.GeneralTreeElementPathComponent(this._generalTreeElement.previousSibling); 51 52 return new WebInspector.GeneralTreeElementPathComponent(previousSibling); 48 53 }, 49 54 50 55 get nextSibling() 51 56 { 52 if (!this._generalTreeElement.nextSibling) 57 var nextSibling = this._generalTreeElement.nextSibling; 58 while (nextSibling && nextSibling.hidden) 59 nextSibling = nextSibling.nextSibling; 60 61 if (!nextSibling) 53 62 return null; 54 return new WebInspector.GeneralTreeElementPathComponent(this._generalTreeElement.nextSibling); 63 64 return new WebInspector.GeneralTreeElementPathComponent(nextSibling); 55 65 }, 56 66 -
trunk/Source/WebInspectorUI/UserInterface/OverviewTimelineView.js
r162560 r162561 102 102 103 103 if (!this.currentTime !== oldCurrentTime) { 104 var selectedTreeElement = this.navigationSidebarTreeOutline.selectedTreeElement; 105 var selectionWasHidden = selectedTreeElement && selectedTreeElement.hidden; 106 104 107 // Check the filters again since the current time change might have revealed this node. Start and end time changes are handled by TimelineContentView. 105 108 WebInspector.timelineSidebarPanel.updateFilter(); 109 110 if (selectedTreeElement && selectedTreeElement.hidden !== selectionWasHidden) 111 this.dispatchEventToListeners(WebInspector.TimelineView.Event.SelectionPathComponentsDidChange); 106 112 } 107 113 … … 124 130 if (!treeElement) 125 131 break; 132 133 if (treeElement.hidden) 134 return null; 126 135 127 136 var pathComponent = new WebInspector.GeneralTreeElementPathComponent(treeElement); -
trunk/Source/WebInspectorUI/UserInterface/TimelineContentView.js
r162560 r162561 405 405 406 406 // 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)); 408 416 } 409 417 }; -
trunk/Source/WebInspectorUI/UserInterface/TimelineView.js
r162527 r162561 64 64 get selectionPathComponents() 65 65 { 66 if (!this._contentTreeOutline.selectedTreeElement )66 if (!this._contentTreeOutline.selectedTreeElement || this._contentTreeOutline.selectedTreeElement.hidden) 67 67 return null; 68 68
Note: See TracChangeset
for help on using the changeset viewer.