| Index: third_party/WebKit/Source/devtools/front_end/elements/ElementsTreeElementHighlighter.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/elements/ElementsTreeElementHighlighter.js b/third_party/WebKit/Source/devtools/front_end/elements/ElementsTreeElementHighlighter.js
|
| index 126db2e19fcc5a6fce2fab6b809b4f58f788d45a..307d33482a2d5e44c76c7419d01ba61491546070 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/elements/ElementsTreeElementHighlighter.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/elements/ElementsTreeElementHighlighter.js
|
| @@ -1,93 +1,93 @@
|
| // Copyright (c) 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -
|
| /**
|
| - * @constructor
|
| - * @param {!WebInspector.ElementsTreeOutline} treeOutline
|
| + * @unrestricted
|
| */
|
| -WebInspector.ElementsTreeElementHighlighter = function(treeOutline)
|
| -{
|
| +WebInspector.ElementsTreeElementHighlighter = class {
|
| + /**
|
| + * @param {!WebInspector.ElementsTreeOutline} treeOutline
|
| + */
|
| + constructor(treeOutline) {
|
| this._throttler = new WebInspector.Throttler(100);
|
| this._treeOutline = treeOutline;
|
| this._treeOutline.addEventListener(TreeOutline.Events.ElementExpanded, this._clearState, this);
|
| this._treeOutline.addEventListener(TreeOutline.Events.ElementCollapsed, this._clearState, this);
|
| - this._treeOutline.addEventListener(WebInspector.ElementsTreeOutline.Events.SelectedNodeChanged, this._clearState, this);
|
| - WebInspector.targetManager.addModelListener(WebInspector.DOMModel, WebInspector.DOMModel.Events.NodeHighlightedInOverlay, this._highlightNode, this);
|
| - this._treeOutline.domModel().addEventListener(WebInspector.DOMModel.Events.InspectModeWillBeToggled, this._clearState, this);
|
| -};
|
| -
|
| -WebInspector.ElementsTreeElementHighlighter.prototype = {
|
| - /**
|
| - * @param {!WebInspector.Event} event
|
| - */
|
| - _highlightNode: function(event)
|
| - {
|
| - if (!WebInspector.moduleSetting("highlightNodeOnHoverInOverlay").get())
|
| - return;
|
| + this._treeOutline.addEventListener(
|
| + WebInspector.ElementsTreeOutline.Events.SelectedNodeChanged, this._clearState, this);
|
| + WebInspector.targetManager.addModelListener(
|
| + WebInspector.DOMModel, WebInspector.DOMModel.Events.NodeHighlightedInOverlay, this._highlightNode, this);
|
| + this._treeOutline.domModel().addEventListener(
|
| + WebInspector.DOMModel.Events.InspectModeWillBeToggled, this._clearState, this);
|
| + }
|
|
|
| - var domNode = /** @type {!WebInspector.DOMNode} */ (event.data);
|
| + /**
|
| + * @param {!WebInspector.Event} event
|
| + */
|
| + _highlightNode(event) {
|
| + if (!WebInspector.moduleSetting('highlightNodeOnHoverInOverlay').get())
|
| + return;
|
|
|
| - this._throttler.schedule(callback.bind(this));
|
| - this._pendingHighlightNode = this._treeOutline.domModel() === domNode.domModel() ? domNode : null;
|
| + var domNode = /** @type {!WebInspector.DOMNode} */ (event.data);
|
|
|
| - /**
|
| - * @this {WebInspector.ElementsTreeElementHighlighter}
|
| - */
|
| - function callback()
|
| - {
|
| - this._highlightNodeInternal(this._pendingHighlightNode);
|
| - delete this._pendingHighlightNode;
|
| - return Promise.resolve();
|
| - }
|
| - },
|
| + this._throttler.schedule(callback.bind(this));
|
| + this._pendingHighlightNode = this._treeOutline.domModel() === domNode.domModel() ? domNode : null;
|
|
|
| /**
|
| - * @param {?WebInspector.DOMNode} node
|
| + * @this {WebInspector.ElementsTreeElementHighlighter}
|
| */
|
| - _highlightNodeInternal: function(node)
|
| - {
|
| - this._isModifyingTreeOutline = true;
|
| - var treeElement = null;
|
| + function callback() {
|
| + this._highlightNodeInternal(this._pendingHighlightNode);
|
| + delete this._pendingHighlightNode;
|
| + return Promise.resolve();
|
| + }
|
| + }
|
|
|
| - if (this._currentHighlightedElement) {
|
| - var currentTreeElement = this._currentHighlightedElement;
|
| - while (currentTreeElement !== this._alreadyExpandedParentElement) {
|
| - if (currentTreeElement.expanded)
|
| - currentTreeElement.collapse();
|
| + /**
|
| + * @param {?WebInspector.DOMNode} node
|
| + */
|
| + _highlightNodeInternal(node) {
|
| + this._isModifyingTreeOutline = true;
|
| + var treeElement = null;
|
|
|
| - currentTreeElement = currentTreeElement.parent;
|
| - }
|
| - }
|
| + if (this._currentHighlightedElement) {
|
| + var currentTreeElement = this._currentHighlightedElement;
|
| + while (currentTreeElement !== this._alreadyExpandedParentElement) {
|
| + if (currentTreeElement.expanded)
|
| + currentTreeElement.collapse();
|
|
|
| - delete this._currentHighlightedElement;
|
| - delete this._alreadyExpandedParentElement;
|
| - if (node) {
|
| - var deepestExpandedParent = node;
|
| - var treeElementSymbol = this._treeOutline.treeElementSymbol();
|
| - while (deepestExpandedParent && (!deepestExpandedParent[treeElementSymbol] || !deepestExpandedParent[treeElementSymbol].expanded))
|
| - deepestExpandedParent = deepestExpandedParent.parentNode;
|
| + currentTreeElement = currentTreeElement.parent;
|
| + }
|
| + }
|
|
|
| - this._alreadyExpandedParentElement = deepestExpandedParent ? deepestExpandedParent[treeElementSymbol] : this._treeOutline.rootElement();
|
| - treeElement = this._treeOutline.createTreeElementFor(node);
|
| - }
|
| + delete this._currentHighlightedElement;
|
| + delete this._alreadyExpandedParentElement;
|
| + if (node) {
|
| + var deepestExpandedParent = node;
|
| + var treeElementSymbol = this._treeOutline.treeElementSymbol();
|
| + while (deepestExpandedParent &&
|
| + (!deepestExpandedParent[treeElementSymbol] || !deepestExpandedParent[treeElementSymbol].expanded))
|
| + deepestExpandedParent = deepestExpandedParent.parentNode;
|
|
|
| - this._currentHighlightedElement = treeElement;
|
| - this._treeOutline.setHoverEffect(treeElement);
|
| - if (treeElement)
|
| - treeElement.reveal(true);
|
| + this._alreadyExpandedParentElement =
|
| + deepestExpandedParent ? deepestExpandedParent[treeElementSymbol] : this._treeOutline.rootElement();
|
| + treeElement = this._treeOutline.createTreeElementFor(node);
|
| + }
|
|
|
| - this._isModifyingTreeOutline = false;
|
| - },
|
| + this._currentHighlightedElement = treeElement;
|
| + this._treeOutline.setHoverEffect(treeElement);
|
| + if (treeElement)
|
| + treeElement.reveal(true);
|
|
|
| - _clearState: function()
|
| - {
|
| - if (this._isModifyingTreeOutline)
|
| - return;
|
| + this._isModifyingTreeOutline = false;
|
| + }
|
|
|
| - delete this._currentHighlightedElement;
|
| - delete this._alreadyExpandedParentElement;
|
| - delete this._pendingHighlightNode;
|
| - }
|
| + _clearState() {
|
| + if (this._isModifyingTreeOutline)
|
| + return;
|
|
|
| + delete this._currentHighlightedElement;
|
| + delete this._alreadyExpandedParentElement;
|
| + delete this._pendingHighlightNode;
|
| + }
|
| };
|
|
|