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

Unified Diff: third_party/WebKit/Source/devtools/front_end/components/EventListenersView.js

Issue 2466123002: DevTools: reformat front-end code to match chromium style. (Closed)
Patch Set: all done Created 4 years, 1 month 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/components/EventListenersView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/components/EventListenersView.js b/third_party/WebKit/Source/devtools/front_end/components/EventListenersView.js
index 601b8e37cca96c54fc3b94b6b546f53b39ce0b0f..a796addca314dfe888a9643286a0b645c90f20e1 100644
--- a/third_party/WebKit/Source/devtools/front_end/components/EventListenersView.js
+++ b/third_party/WebKit/Source/devtools/front_end/components/EventListenersView.js
@@ -1,363 +1,345 @@
// Copyright 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.
-
/**
-* @typedef {Array<{object: !WebInspector.RemoteObject, eventListeners: ?Array<!WebInspector.EventListener>, frameworkEventListeners: ?{eventListeners: ?Array<!WebInspector.EventListener>, internalHandlers: ?WebInspector.RemoteArray}, isInternal: ?Array<boolean>}>}
-*/
+ * @typedef {Array<{object: !WebInspector.RemoteObject, eventListeners: ?Array<!WebInspector.EventListener>, frameworkEventListeners: ?{eventListeners: ?Array<!WebInspector.EventListener>, internalHandlers: ?WebInspector.RemoteArray}, isInternal: ?Array<boolean>}>}
+ */
WebInspector.EventListenersResult;
/**
- * @constructor
- * @param {!Element} element
- * @param {function()} changeCallback
+ * @unrestricted
*/
-WebInspector.EventListenersView = function(element, changeCallback)
-{
+WebInspector.EventListenersView = class {
+ /**
+ * @param {!Element} element
+ * @param {function()} changeCallback
+ */
+ constructor(element, changeCallback) {
this._element = element;
this._changeCallback = changeCallback;
this._treeOutline = new TreeOutlineInShadow();
this._treeOutline.hideOverflow();
- this._treeOutline.registerRequiredCSS("components/objectValue.css");
- this._treeOutline.registerRequiredCSS("components/eventListenersView.css");
+ this._treeOutline.registerRequiredCSS('components/objectValue.css');
+ this._treeOutline.registerRequiredCSS('components/eventListenersView.css');
this._treeOutline.setComparator(WebInspector.EventListenersTreeElement.comparator);
- this._treeOutline.element.classList.add("monospace");
+ this._treeOutline.element.classList.add('monospace');
this._element.appendChild(this._treeOutline.element);
- this._emptyHolder = createElementWithClass("div", "gray-info-message");
- this._emptyHolder.textContent = WebInspector.UIString("No Event Listeners");
+ this._emptyHolder = createElementWithClass('div', 'gray-info-message');
+ this._emptyHolder.textContent = WebInspector.UIString('No Event Listeners');
this._linkifier = new WebInspector.Linkifier();
/** @type {!Map<string, !WebInspector.EventListenersTreeElement>} */
this._treeItemMap = new Map();
-};
-
-WebInspector.EventListenersView.prototype = {
- /**
- * @param {!Array<!WebInspector.RemoteObject>} objects
- * @return {!Promise<undefined>}
- */
- addObjects: function(objects)
- {
- this.reset();
- var promises = [];
- for (var object of objects)
- promises.push(this._addObject(object));
- return Promise.all(promises).then(this.addEmptyHolderIfNeeded.bind(this)).then(this._eventListenersArrivedForTest.bind(this));
- },
+ }
+
+ /**
+ * @param {!Array<!WebInspector.RemoteObject>} objects
+ * @return {!Promise<undefined>}
+ */
+ addObjects(objects) {
+ this.reset();
+ var promises = [];
+ for (var object of objects)
+ promises.push(this._addObject(object));
+ return Promise.all(promises)
+ .then(this.addEmptyHolderIfNeeded.bind(this))
+ .then(this._eventListenersArrivedForTest.bind(this));
+ }
+
+ /**
+ * @param {!WebInspector.RemoteObject} object
+ * @return {!Promise<undefined>}
+ */
+ _addObject(object) {
+ /** @type {?Array<!WebInspector.EventListener>} */
+ var eventListeners = null;
+ /** @type {?WebInspector.FrameworkEventListenersObject}*/
+ var frameworkEventListenersObject = null;
+
+ var promises = [];
+ promises.push(object.eventListeners().then(storeEventListeners));
+ promises.push(WebInspector.EventListener.frameworkEventListeners(object).then(storeFrameworkEventListenersObject));
+ return Promise.all(promises).then(markInternalEventListeners).then(addEventListeners.bind(this));
/**
- * @param {!WebInspector.RemoteObject} object
- * @return {!Promise<undefined>}
+ * @param {?Array<!WebInspector.EventListener>} result
*/
- _addObject: function(object)
- {
- /** @type {?Array<!WebInspector.EventListener>} */
- var eventListeners = null;
- /** @type {?WebInspector.FrameworkEventListenersObject}*/
- var frameworkEventListenersObject = null;
-
- var promises = [];
- promises.push(object.eventListeners().then(storeEventListeners));
- promises.push(WebInspector.EventListener.frameworkEventListeners(object).then(storeFrameworkEventListenersObject));
- return Promise.all(promises).then(markInternalEventListeners).then(addEventListeners.bind(this));
-
- /**
- * @param {?Array<!WebInspector.EventListener>} result
- */
- function storeEventListeners(result)
- {
- eventListeners = result;
- }
-
- /**
- * @param {?WebInspector.FrameworkEventListenersObject} result
- */
- function storeFrameworkEventListenersObject(result)
- {
- frameworkEventListenersObject = result;
- }
-
- /**
- * @return {!Promise<undefined>}
- */
- function markInternalEventListeners()
- {
- if (!eventListeners || !frameworkEventListenersObject.internalHandlers)
- return Promise.resolve(undefined);
- return frameworkEventListenersObject.internalHandlers.object().callFunctionJSONPromise(isInternalEventListener, eventListeners.map(handlerArgument)).then(setIsInternal);
-
- /**
- * @param {!WebInspector.EventListener} listener
- * @return {!RuntimeAgent.CallArgument}
- */
- function handlerArgument(listener)
- {
- return WebInspector.RemoteObject.toCallArgument(listener.handler());
- }
-
- /**
- * @suppressReceiverCheck
- * @return {!Array<boolean>}
- * @this {Array<*>}
- */
- function isInternalEventListener()
- {
- var isInternal = [];
- var internalHandlersSet = new Set(this);
- for (var handler of arguments)
- isInternal.push(internalHandlersSet.has(handler));
- return isInternal;
- }
-
- /**
- * @param {!Array<boolean>} isInternal
- */
- function setIsInternal(isInternal)
- {
- for (var i = 0; i < eventListeners.length; ++i) {
- if (isInternal[i])
- eventListeners[i].setListenerType("frameworkInternal");
- }
- }
- }
-
- /**
- * @this {WebInspector.EventListenersView}
- */
- function addEventListeners()
- {
- this._addObjectEventListeners(object, eventListeners);
- this._addObjectEventListeners(object, frameworkEventListenersObject.eventListeners);
- }
- },
+ function storeEventListeners(result) {
+ eventListeners = result;
+ }
/**
- * @param {!WebInspector.RemoteObject} object
- * @param {?Array<!WebInspector.EventListener>} eventListeners
+ * @param {?WebInspector.FrameworkEventListenersObject} result
*/
- _addObjectEventListeners: function(object, eventListeners)
- {
- if (!eventListeners)
- return;
- for (var eventListener of eventListeners) {
- var treeItem = this._getOrCreateTreeElementForType(eventListener.type());
- treeItem.addObjectEventListener(eventListener, object);
- }
- },
+ function storeFrameworkEventListenersObject(result) {
+ frameworkEventListenersObject = result;
+ }
/**
- * @param {boolean} showFramework
- * @param {boolean} showPassive
- * @param {boolean} showBlocking
+ * @return {!Promise<undefined>}
*/
- showFrameworkListeners: function(showFramework, showPassive, showBlocking)
- {
- var eventTypes = this._treeOutline.rootElement().children();
- for (var eventType of eventTypes) {
- var hiddenEventType = true;
- for (var listenerElement of eventType.children()) {
- var listenerType = listenerElement.eventListener().listenerType();
- var hidden = false;
- if (listenerType === "frameworkUser" && !showFramework)
- hidden = true;
- if (listenerType === "frameworkInternal" && showFramework)
- hidden = true;
- if (!showPassive && listenerElement.eventListener().passive())
- hidden = true;
- if (!showBlocking && !listenerElement.eventListener().passive())
- hidden = true;
- listenerElement.hidden = hidden;
- hiddenEventType = hiddenEventType && hidden;
- }
- eventType.hidden = hiddenEventType;
+ function markInternalEventListeners() {
+ if (!eventListeners || !frameworkEventListenersObject.internalHandlers)
+ return Promise.resolve(undefined);
+ return frameworkEventListenersObject.internalHandlers.object()
+ .callFunctionJSONPromise(isInternalEventListener, eventListeners.map(handlerArgument))
+ .then(setIsInternal);
+
+ /**
+ * @param {!WebInspector.EventListener} listener
+ * @return {!RuntimeAgent.CallArgument}
+ */
+ function handlerArgument(listener) {
+ return WebInspector.RemoteObject.toCallArgument(listener.handler());
+ }
+
+ /**
+ * @suppressReceiverCheck
+ * @return {!Array<boolean>}
+ * @this {Array<*>}
+ */
+ function isInternalEventListener() {
+ var isInternal = [];
+ var internalHandlersSet = new Set(this);
+ for (var handler of arguments)
+ isInternal.push(internalHandlersSet.has(handler));
+ return isInternal;
+ }
+
+ /**
+ * @param {!Array<boolean>} isInternal
+ */
+ function setIsInternal(isInternal) {
+ for (var i = 0; i < eventListeners.length; ++i) {
+ if (isInternal[i])
+ eventListeners[i].setListenerType('frameworkInternal');
}
- },
+ }
+ }
/**
- * @param {string} type
- * @return {!WebInspector.EventListenersTreeElement}
+ * @this {WebInspector.EventListenersView}
*/
- _getOrCreateTreeElementForType: function(type)
- {
- var treeItem = this._treeItemMap.get(type);
- if (!treeItem) {
- treeItem = new WebInspector.EventListenersTreeElement(type, this._linkifier, this._changeCallback);
- this._treeItemMap.set(type, treeItem);
- treeItem.hidden = true;
- this._treeOutline.appendChild(treeItem);
- }
- this._emptyHolder.remove();
- return treeItem;
- },
-
- addEmptyHolderIfNeeded: function()
- {
- var allHidden = true;
- for (var eventType of this._treeOutline.rootElement().children()) {
- eventType.hidden = !eventType.firstChild();
- allHidden = allHidden && eventType.hidden;
- }
- if (allHidden && !this._emptyHolder.parentNode)
- this._element.appendChild(this._emptyHolder);
- },
-
- reset: function()
- {
- var eventTypes = this._treeOutline.rootElement().children();
- for (var eventType of eventTypes)
- eventType.removeChildren();
- this._linkifier.reset();
- },
-
- _eventListenersArrivedForTest: function()
- {
+ function addEventListeners() {
+ this._addObjectEventListeners(object, eventListeners);
+ this._addObjectEventListeners(object, frameworkEventListenersObject.eventListeners);
}
+ }
+
+ /**
+ * @param {!WebInspector.RemoteObject} object
+ * @param {?Array<!WebInspector.EventListener>} eventListeners
+ */
+ _addObjectEventListeners(object, eventListeners) {
+ if (!eventListeners)
+ return;
+ for (var eventListener of eventListeners) {
+ var treeItem = this._getOrCreateTreeElementForType(eventListener.type());
+ treeItem.addObjectEventListener(eventListener, object);
+ }
+ }
+
+ /**
+ * @param {boolean} showFramework
+ * @param {boolean} showPassive
+ * @param {boolean} showBlocking
+ */
+ showFrameworkListeners(showFramework, showPassive, showBlocking) {
+ var eventTypes = this._treeOutline.rootElement().children();
+ for (var eventType of eventTypes) {
+ var hiddenEventType = true;
+ for (var listenerElement of eventType.children()) {
+ var listenerType = listenerElement.eventListener().listenerType();
+ var hidden = false;
+ if (listenerType === 'frameworkUser' && !showFramework)
+ hidden = true;
+ if (listenerType === 'frameworkInternal' && showFramework)
+ hidden = true;
+ if (!showPassive && listenerElement.eventListener().passive())
+ hidden = true;
+ if (!showBlocking && !listenerElement.eventListener().passive())
+ hidden = true;
+ listenerElement.hidden = hidden;
+ hiddenEventType = hiddenEventType && hidden;
+ }
+ eventType.hidden = hiddenEventType;
+ }
+ }
+
+ /**
+ * @param {string} type
+ * @return {!WebInspector.EventListenersTreeElement}
+ */
+ _getOrCreateTreeElementForType(type) {
+ var treeItem = this._treeItemMap.get(type);
+ if (!treeItem) {
+ treeItem = new WebInspector.EventListenersTreeElement(type, this._linkifier, this._changeCallback);
+ this._treeItemMap.set(type, treeItem);
+ treeItem.hidden = true;
+ this._treeOutline.appendChild(treeItem);
+ }
+ this._emptyHolder.remove();
+ return treeItem;
+ }
+
+ addEmptyHolderIfNeeded() {
+ var allHidden = true;
+ for (var eventType of this._treeOutline.rootElement().children()) {
+ eventType.hidden = !eventType.firstChild();
+ allHidden = allHidden && eventType.hidden;
+ }
+ if (allHidden && !this._emptyHolder.parentNode)
+ this._element.appendChild(this._emptyHolder);
+ }
+
+ reset() {
+ var eventTypes = this._treeOutline.rootElement().children();
+ for (var eventType of eventTypes)
+ eventType.removeChildren();
+ this._linkifier.reset();
+ }
+
+ _eventListenersArrivedForTest() {
+ }
};
/**
- * @constructor
- * @extends {TreeElement}
- * @param {string} type
- * @param {!WebInspector.Linkifier} linkifier
- * @param {function()} changeCallback
+ * @unrestricted
*/
-WebInspector.EventListenersTreeElement = function(type, linkifier, changeCallback)
-{
- TreeElement.call(this, type);
+WebInspector.EventListenersTreeElement = class extends TreeElement {
+ /**
+ * @param {string} type
+ * @param {!WebInspector.Linkifier} linkifier
+ * @param {function()} changeCallback
+ */
+ constructor(type, linkifier, changeCallback) {
+ super(type);
this.toggleOnClick = true;
this.selectable = false;
this._linkifier = linkifier;
this._changeCallback = changeCallback;
-};
-
-/**
- * @param {!TreeElement} element1
- * @param {!TreeElement} element2
- * @return {number}
- */
-WebInspector.EventListenersTreeElement.comparator = function(element1, element2) {
+ }
+
+ /**
+ * @param {!TreeElement} element1
+ * @param {!TreeElement} element2
+ * @return {number}
+ */
+ static comparator(element1, element2) {
if (element1.title === element2.title)
- return 0;
+ return 0;
return element1.title > element2.title ? 1 : -1;
+ }
+
+ /**
+ * @param {!WebInspector.EventListener} eventListener
+ * @param {!WebInspector.RemoteObject} object
+ */
+ addObjectEventListener(eventListener, object) {
+ var treeElement =
+ new WebInspector.ObjectEventListenerBar(eventListener, object, this._linkifier, this._changeCallback);
+ this.appendChild(/** @type {!TreeElement} */ (treeElement));
+ }
};
-WebInspector.EventListenersTreeElement.prototype = {
- /**
- * @param {!WebInspector.EventListener} eventListener
- * @param {!WebInspector.RemoteObject} object
- */
- addObjectEventListener: function(eventListener, object)
- {
- var treeElement = new WebInspector.ObjectEventListenerBar(eventListener, object, this._linkifier, this._changeCallback);
- this.appendChild(/** @type {!TreeElement} */ (treeElement));
- },
-
- __proto__: TreeElement.prototype
-};
/**
- * @constructor
- * @extends {TreeElement}
- * @param {!WebInspector.EventListener} eventListener
- * @param {!WebInspector.RemoteObject} object
- * @param {!WebInspector.Linkifier} linkifier
- * @param {function()} changeCallback
+ * @unrestricted
*/
-WebInspector.ObjectEventListenerBar = function(eventListener, object, linkifier, changeCallback)
-{
- TreeElement.call(this, "", true);
+WebInspector.ObjectEventListenerBar = class extends TreeElement {
+ /**
+ * @param {!WebInspector.EventListener} eventListener
+ * @param {!WebInspector.RemoteObject} object
+ * @param {!WebInspector.Linkifier} linkifier
+ * @param {function()} changeCallback
+ */
+ constructor(eventListener, object, linkifier, changeCallback) {
+ super('', true);
this._eventListener = eventListener;
this.editable = false;
this.selectable = false;
this._setTitle(object, linkifier);
this._changeCallback = changeCallback;
-};
+ }
+
+ /**
+ * @override
+ */
+ onpopulate() {
+ var properties = [];
+ var eventListener = this._eventListener;
+ var runtimeModel = eventListener.target().runtimeModel;
+ properties.push(runtimeModel.createRemotePropertyFromPrimitiveValue('useCapture', eventListener.useCapture()));
+ properties.push(runtimeModel.createRemotePropertyFromPrimitiveValue('passive', eventListener.passive()));
+ if (typeof eventListener.handler() !== 'undefined')
+ properties.push(new WebInspector.RemoteObjectProperty('handler', eventListener.handler()));
+ WebInspector.ObjectPropertyTreeElement.populateWithProperties(this, properties, [], true, null);
+ }
+
+ /**
+ * @param {!WebInspector.RemoteObject} object
+ * @param {!WebInspector.Linkifier} linkifier
+ */
+ _setTitle(object, linkifier) {
+ var title = this.listItemElement.createChild('span');
+ var subtitle = this.listItemElement.createChild('span', 'event-listener-tree-subtitle');
+ subtitle.appendChild(linkifier.linkifyRawLocation(this._eventListener.location(), this._eventListener.sourceURL()));
+
+ title.appendChild(WebInspector.ObjectPropertiesSection.createValueElement(object, false));
+
+ if (this._eventListener.removeFunction()) {
+ var deleteButton = title.createChild('span', 'event-listener-button');
+ deleteButton.textContent = WebInspector.UIString('Remove');
+ deleteButton.title = WebInspector.UIString('Delete event listener');
+ deleteButton.addEventListener('click', removeListener.bind(this), false);
+ title.appendChild(deleteButton);
+ }
-WebInspector.ObjectEventListenerBar.prototype = {
- onpopulate: function()
- {
- var properties = [];
- var eventListener = this._eventListener;
- var runtimeModel = eventListener.target().runtimeModel;
- properties.push(runtimeModel.createRemotePropertyFromPrimitiveValue("useCapture", eventListener.useCapture()));
- properties.push(runtimeModel.createRemotePropertyFromPrimitiveValue("passive", eventListener.passive()));
- if (typeof eventListener.handler() !== "undefined")
- properties.push(new WebInspector.RemoteObjectProperty("handler", eventListener.handler()));
- WebInspector.ObjectPropertyTreeElement.populateWithProperties(this, properties, [], true, null);
- },
+ if (this._eventListener.isScrollBlockingType() && this._eventListener.isNormalListenerType()) {
+ var passiveButton = title.createChild('span', 'event-listener-button');
+ passiveButton.textContent = WebInspector.UIString('Toggle Passive');
+ passiveButton.title = WebInspector.UIString('Toggle whether event listener is passive or blocking');
+ passiveButton.addEventListener('click', togglePassiveListener.bind(this), false);
+ title.appendChild(passiveButton);
+ }
/**
- * @param {!WebInspector.RemoteObject} object
- * @param {!WebInspector.Linkifier} linkifier
+ * @param {!WebInspector.Event} event
+ * @this {WebInspector.ObjectEventListenerBar}
*/
- _setTitle: function(object, linkifier)
- {
- var title = this.listItemElement.createChild("span");
- var subtitle = this.listItemElement.createChild("span", "event-listener-tree-subtitle");
- subtitle.appendChild(linkifier.linkifyRawLocation(this._eventListener.location(), this._eventListener.sourceURL()));
-
- title.appendChild(WebInspector.ObjectPropertiesSection.createValueElement(object, false));
-
- if (this._eventListener.removeFunction()) {
- var deleteButton = title.createChild("span", "event-listener-button");
- deleteButton.textContent = WebInspector.UIString("Remove");
- deleteButton.title = WebInspector.UIString("Delete event listener");
- deleteButton.addEventListener("click", removeListener.bind(this), false);
- title.appendChild(deleteButton);
- }
-
- if (this._eventListener.isScrollBlockingType() &&
- this._eventListener.isNormalListenerType()) {
- var passiveButton = title.createChild("span", "event-listener-button");
- passiveButton.textContent = WebInspector.UIString("Toggle Passive");
- passiveButton.title = WebInspector.UIString("Toggle whether event listener is passive or blocking");
- passiveButton.addEventListener("click", togglePassiveListener.bind(this), false);
- title.appendChild(passiveButton);
- }
-
- /**
- * @param {!WebInspector.Event} event
- * @this {WebInspector.ObjectEventListenerBar}
- */
- function removeListener(event)
- {
- event.consume();
- this._removeListenerBar();
- this._eventListener.remove();
- }
-
- /**
- * @param {!WebInspector.Event} event
- * @this {WebInspector.ObjectEventListenerBar}
- */
- function togglePassiveListener(event)
- {
- event.consume();
- this._eventListener.togglePassive().then(this._changeCallback());
- }
- },
-
- _removeListenerBar: function()
- {
- var parent = this.parent;
- parent.removeChild(this);
- if (!parent.childCount()) {
- parent.parent.removeChild(parent);
- return;
- }
- var allHidden = true;
- for (var i = 0; i < parent.childCount(); ++i)
- if (!parent.childAt(i).hidden)
- allHidden = false;
- parent.hidden = allHidden;
- },
+ function removeListener(event) {
+ event.consume();
+ this._removeListenerBar();
+ this._eventListener.remove();
+ }
/**
- * @return {!WebInspector.EventListener}
+ * @param {!WebInspector.Event} event
+ * @this {WebInspector.ObjectEventListenerBar}
*/
- eventListener: function()
- {
- return this._eventListener;
- },
-
- __proto__: TreeElement.prototype
+ function togglePassiveListener(event) {
+ event.consume();
+ this._eventListener.togglePassive().then(this._changeCallback());
+ }
+ }
+
+ _removeListenerBar() {
+ var parent = this.parent;
+ parent.removeChild(this);
+ if (!parent.childCount()) {
+ parent.parent.removeChild(parent);
+ return;
+ }
+ var allHidden = true;
+ for (var i = 0; i < parent.childCount(); ++i)
+ if (!parent.childAt(i).hidden)
+ allHidden = false;
+ parent.hidden = allHidden;
+ }
+
+ /**
+ * @return {!WebInspector.EventListener}
+ */
+ eventListener() {
+ return this._eventListener;
+ }
};

Powered by Google App Engine
This is Rietveld 408576698