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

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

Issue 2564433004: DevTools: migrate last usages of samllIcons.png to UI.Icon (Closed)
Patch Set: better css Created 4 years 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 | « third_party/WebKit/Source/devtools/front_end/ui/treeoutline.css ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/ui/treeoutline.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/treeoutline.js b/third_party/WebKit/Source/devtools/front_end/ui/treeoutline.js
index 55b61a2726a9b3bd21b5d06e2467dec91a050972..b4881658f2733a8c9e61f0fc700d421aceb2dc58 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/treeoutline.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/treeoutline.js
@@ -44,10 +44,22 @@ var TreeOutline = class extends Common.Object {
this.contentElement = this._rootElement._childrenListNode;
this.contentElement.addEventListener('keydown', this._treeKeyDown.bind(this), true);
+ this.contentElement.addEventListener('focus', setFocused.bind(this, true));
dgozman 2016/12/09 22:04:06 Forgot to pass false for capture here and below.
lushnikov 2016/12/10 00:52:50 Done.
+ this.contentElement.addEventListener('blur', setFocused.bind(this, false));
this.setFocusable(!nonFocusable);
this.element = this.contentElement;
+
+ /**
+ * @param {boolean} isFocused
+ * @this {TreeOutline}
+ */
+ function setFocused(isFocused) {
+ this._focused = isFocused;
+ if (this.selectedTreeElement)
+ this.selectedTreeElement._setFocused(this._focused);
+ }
}
_createRootElement() {
@@ -308,6 +320,7 @@ var TreeElement = class {
this.nextSibling = null;
this._listItemNode = createElement('li');
+ this._titleElement = this._listItemNode.createChild('span', 'tree-element-title');
this._listItemNode.treeElement = this;
if (title)
this.title = title;
@@ -552,6 +565,13 @@ var TreeElement = class {
return this._listItemNode;
}
+ /**
+ * @return {!Element}
+ */
+ titleElement() {
+ return this._titleElement;
+ }
+
get childrenListElement() {
return this._childrenListNode;
}
@@ -572,7 +592,6 @@ var TreeElement = class {
this._title = x;
if (typeof x === 'string') {
- this._titleElement = createElementWithClass('span', 'tree-element-title');
this._titleElement.textContent = x;
this.tooltip = x;
} else {
@@ -585,6 +604,8 @@ var TreeElement = class {
this._listItemNode.appendChild(this._iconElement);
this._listItemNode.appendChild(this._titleElement);
+ if (this._trailingIconsElement)
+ this._listItemNode.appendChild(this._trailingIconsElement);
this._ensureSelection();
}
@@ -616,6 +637,30 @@ var TreeElement = class {
}
/**
+ * @param {!Array<!UI.Icon>} icons
+ */
+ setTrailingIcons(icons) {
+ if (!this._trailingIconsElement && !icons.length)
+ return;
+ if (!this._trailingIconsElement) {
+ this._trailingIconsElement = createElementWithClass('div', 'icons-container');
+ this._listItemNode.appendChild(this._trailingIconsElement);
+ this._ensureSelection();
+ }
+ this._trailingIconsElement.removeChildren();
+ for (var icon of icons)
+ this._trailingIconsElement.appendChild(icon);
+ }
+
+ /**
+ * @param {boolean} focused
+ */
+ _setFocused(focused) {
+ this._focused = focused;
+ this._listItemNode.classList.toggle('force-white-icons', focused);
+ }
+
+ /**
* @return {string}
*/
get tooltip() {
@@ -945,6 +990,7 @@ var TreeElement = class {
return false;
this.treeOutline.selectedTreeElement = this;
this._listItemNode.classList.add('selected');
+ this._setFocused(this.treeOutline._focused);
this.treeOutline.dispatchEventToListeners(TreeOutline.Events.ElementSelected, this);
return this.onselect(selectedByUser);
}
@@ -967,6 +1013,7 @@ var TreeElement = class {
this.selected = false;
this.treeOutline.selectedTreeElement = null;
this._listItemNode.classList.remove('selected');
+ this._setFocused(false);
}
_populateIfNeeded() {
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/ui/treeoutline.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698