Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1508)

Unified Diff: Source/devtools/front_end/timeline/TimelinePanel.js

Issue 1173363012: DevTools: Network panel filter bar overlaps after select resource row. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: test fixed Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/promises/promisePane.css ('k') | Source/devtools/front_end/ui/FilterBar.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/timeline/TimelinePanel.js
diff --git a/Source/devtools/front_end/timeline/TimelinePanel.js b/Source/devtools/front_end/timeline/TimelinePanel.js
index 2dc7f9f596525d2081b7ab38e8cf8df2cbe87e86..a1f08028b4ea4e4ad4c3205907dcc476e286df27 100644
--- a/Source/devtools/front_end/timeline/TimelinePanel.js
+++ b/Source/devtools/front_end/timeline/TimelinePanel.js
@@ -374,10 +374,7 @@ WebInspector.TimelinePanel.prototype = {
this._progressToolbarItem.setVisible(false);
this._panelToolbar.appendToolbarItem(this._progressToolbarItem);
- this._filtersContainer = this.element.createChild("div", "timeline-filters-header hidden");
- this._filtersContainer.appendChild(this._filterBar.filtersElement());
- this._filterBar.addEventListener(WebInspector.FilterBar.Events.FiltersToggled, this._onFiltersToggled, this);
- this._filterBar.setName("timelinePanel");
+ this.element.appendChild(this._filterBar.filtersElement());
},
/**
@@ -385,7 +382,7 @@ WebInspector.TimelinePanel.prototype = {
*/
_createFilterBar: function()
{
- this._filterBar = new WebInspector.FilterBar();
+ this._filterBar = new WebInspector.FilterBar("timelinePanel");
this._filters = {};
this._filters._textFilterUI = new WebInspector.TextFilterUI();
this._filters._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._textFilterChanged, this);
@@ -445,13 +442,6 @@ WebInspector.TimelinePanel.prototype = {
this._categoryFilter.notifyFilterChanged();
},
- _onFiltersToggled: function(event)
- {
- var toggled = /** @type {boolean} */ (event.data);
- this._filtersContainer.classList.toggle("hidden", !toggled);
- this.doResize();
- },
-
/**
* @return {!WebInspector.Progress}
*/
@@ -618,14 +608,14 @@ WebInspector.TimelinePanel.prototype = {
if (this._flameChartEnabledSetting.get()) {
this._filterBar.filterButton().setEnabled(false);
- this._filtersContainer.classList.toggle("hidden", true);
+ this._filterBar.filtersElement().classList.toggle("hidden", true);
this._flameChart = new WebInspector.TimelineFlameChartView(this, this._model, this._frameModel());
this._flameChart.enableNetworkPane(this._captureNetworkSetting.get());
this._addModeView(this._flameChart);
} else {
this._flameChart = null;
this._filterBar.filterButton().setEnabled(true);
- this._filtersContainer.classList.toggle("hidden", !this._filterBar.filtersToggled());
+ this._filterBar.filtersElement().classList.toggle("hidden", !this._filterBar.filtersToggled());
var timelineView = new WebInspector.TimelineView(this, this._model);
this._addModeView(timelineView);
timelineView.setFrameModel(isFrameMode ? this._frameModel() : null);
« no previous file with comments | « Source/devtools/front_end/promises/promisePane.css ('k') | Source/devtools/front_end/ui/FilterBar.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698