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

Unified Diff: third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js

Issue 2637443004: DevTools: bring back old landing page in timeline/performance. (Closed)
Patch Set: review comments addressed Created 3 years, 11 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
Index: third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js b/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
index df8ff2885b80a70cd6fb04074c8990b75bf2cd1d..8e6f552001bba2f712cf2fb3412318eddf459255 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
@@ -222,7 +222,7 @@ UI.Toolbar = class {
setEnabled(enabled) {
this._enabled = enabled;
for (var item of this._items)
- item._applyEnabledState();
+ item._applyEnabledState(this._enabled && item._enabled);
}
/**
@@ -232,7 +232,7 @@ UI.Toolbar = class {
this._items.push(item);
item._toolbar = this;
if (!this._enabled)
- item._applyEnabledState();
+ item._applyEnabledState(false);
if (this._reverse)
this._contentElement.insertBefore(item.element, this._insertionPoint.nextSibling);
else
@@ -375,7 +375,7 @@ UI.ToolbarItem = class extends Common.Object {
}
/**
- * @param {string} title
+ * @param {!Element|string} title
*/
setTitle(title) {
if (this._title === title)
@@ -399,11 +399,14 @@ UI.ToolbarItem = class extends Common.Object {
if (this._enabled === value)
return;
this._enabled = value;
- this._applyEnabledState();
+ this._applyEnabledState(this._enabled && (!this._toolbar || this._toolbar._enabled));
}
- _applyEnabledState() {
- this.element.disabled = !this._enabled || (this._toolbar && !this._toolbar._enabled);
+ /**
+ * @param {boolean} enabled
+ */
+ _applyEnabledState(enabled) {
+ this.element.disabled = !enabled;
}
/**
@@ -833,9 +836,11 @@ UI.ToolbarComboBox = class extends UI.ToolbarItem {
/**
* @override
+ * @param {boolean} enabled
*/
- _applyEnabledState() {
- this._selectElement.disabled = !this._enabled || (this._toolbar && !this._toolbar._enabled);
+ _applyEnabledState(enabled) {
+ super._applyEnabledState(enabled);
+ this._selectElement.disabled = !enabled;
}
/**
@@ -922,4 +927,13 @@ UI.ToolbarCheckbox = class extends UI.ToolbarItem {
setChecked(value) {
this.inputElement.checked = value;
}
+
+ /**
+ * @override
+ * @param {boolean} enabled
+ */
+ _applyEnabledState(enabled) {
+ super._applyEnabledState(enabled);
+ this.inputElement.disabled = !enabled;
+ }
};

Powered by Google App Engine
This is Rietveld 408576698