diff --git a/devtools/client/inspector/events/actions/index.js b/devtools/client/inspector/events/actions/index.js deleted file mode 100644 index dd5e4e6830c1..000000000000 --- a/devtools/client/inspector/events/actions/index.js +++ /dev/null @@ -1,14 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -const { createEnum } = require("devtools/client/shared/enum"); - -createEnum([ - - // Update the entire events state with the new list of events. - "UPDATE_EVENTS", - -], module.exports); diff --git a/devtools/client/inspector/events/actions/moz.build b/devtools/client/inspector/events/actions/moz.build deleted file mode 100644 index 4442a2e90683..000000000000 --- a/devtools/client/inspector/events/actions/moz.build +++ /dev/null @@ -1,9 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DevToolsModules( - 'index.js', -) diff --git a/devtools/client/inspector/events/components/EventsApp.js b/devtools/client/inspector/events/components/EventsApp.js deleted file mode 100644 index be226db56a69..000000000000 --- a/devtools/client/inspector/events/components/EventsApp.js +++ /dev/null @@ -1,27 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -const { - DOM: dom, - PureComponent, -} = require("devtools/client/shared/vendor/react"); -const { connect } = require("devtools/client/shared/vendor/react-redux"); - -class EventsApp extends PureComponent { - static get propTypes() { - return {}; - } - - render() { - return dom.div( - { - id: "events-container", - } - ); - } -} - -module.exports = connect(state => state)(EventsApp); diff --git a/devtools/client/inspector/events/components/moz.build b/devtools/client/inspector/events/components/moz.build deleted file mode 100644 index 7df319702179..000000000000 --- a/devtools/client/inspector/events/components/moz.build +++ /dev/null @@ -1,9 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DevToolsModules( - 'EventsApp.js', -) diff --git a/devtools/client/inspector/events/events.js b/devtools/client/inspector/events/events.js deleted file mode 100644 index 08ed3cf07c77..000000000000 --- a/devtools/client/inspector/events/events.js +++ /dev/null @@ -1,52 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -const { createFactory, createElement } = require("devtools/client/shared/vendor/react"); -const { Provider } = require("devtools/client/shared/vendor/react-redux"); - -const EventsApp = createFactory(require("./components/EventsApp")); - -const { LocalizationHelper } = require("devtools/shared/l10n"); -const INSPECTOR_L10N = - new LocalizationHelper("devtools/client/locales/inspector.properties"); - -class EventsView { - - constructor(inspector, window) { - this.document = window.document; - this.inspector = inspector; - this.store = inspector.store; - - this.init(); - } - - init() { - if (!this.inspector) { - return; - } - - let eventsApp = EventsApp({}); - - let provider = createElement(Provider, { - id: "eventsview", - key: "eventsview", - store: this.store, - title: INSPECTOR_L10N.getStr("inspector.sidebar.eventsViewTitle") - }, eventsApp); - - // Expose the provider to let inspector.js use it in setupSidebar. - this.provider = provider; - } - - destroy() { - this.document = null; - this.inspector = null; - this.store = null; - } - -} - -module.exports = EventsView; diff --git a/devtools/client/inspector/events/moz.build b/devtools/client/inspector/events/moz.build deleted file mode 100644 index 69efb1c9fe7c..000000000000 --- a/devtools/client/inspector/events/moz.build +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DIRS += [ - 'actions', - 'components', - 'reducers', -] - -DevToolsModules( - 'events.js', - 'types.js', -) diff --git a/devtools/client/inspector/events/reducers/events.js b/devtools/client/inspector/events/reducers/events.js deleted file mode 100644 index 3b6e19a5f00b..000000000000 --- a/devtools/client/inspector/events/reducers/events.js +++ /dev/null @@ -1,19 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -const INITIAL_EVENTS = []; - -let reducers = { - -}; - -module.exports = function (events = INITIAL_EVENTS, action) { - let reducer = reducers[action.type]; - if (!reducer) { - return events; - } - return reducer(events, action); -}; diff --git a/devtools/client/inspector/events/reducers/index.js b/devtools/client/inspector/events/reducers/index.js deleted file mode 100644 index 9c43c6dd2ea8..000000000000 --- a/devtools/client/inspector/events/reducers/index.js +++ /dev/null @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -exports.events = require("./events"); diff --git a/devtools/client/inspector/events/reducers/moz.build b/devtools/client/inspector/events/reducers/moz.build deleted file mode 100644 index 4d5dc0266aca..000000000000 --- a/devtools/client/inspector/events/reducers/moz.build +++ /dev/null @@ -1,10 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DevToolsModules( - 'events.js', - 'index.js', -) diff --git a/devtools/client/inspector/events/types.js b/devtools/client/inspector/events/types.js deleted file mode 100644 index 41d330f4bdda..000000000000 --- a/devtools/client/inspector/events/types.js +++ /dev/null @@ -1,9 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -exports.changes = { - -}; diff --git a/devtools/client/inspector/inspector.js b/devtools/client/inspector/inspector.js index 4cbbebc272e6..b274664835f2 100644 --- a/devtools/client/inspector/inspector.js +++ b/devtools/client/inspector/inspector.js @@ -678,32 +678,6 @@ Inspector.prototype = { defaultTab == changesId); } - if (Services.prefs.getBoolPref("devtools.eventsview.enabled")) { - // Inject a lazy loaded react tab by exposing a fake React object - // with a lazy defined Tab thanks to `panel` being a function - let eventsId = "eventsview"; - let eventsTitle = INSPECTOR_L10N.getStr("inspector.sidebar.eventsViewTitle"); - this.sidebar.addTab( - eventsId, - eventsTitle, - { - props: { - id: eventsId, - title: eventsTitle - }, - panel: () => { - if (!this.eventview) { - const EventsView = - this.browserRequire("devtools/client/inspector/events/events"); - this.eventsview = new EventsView(this, this.panelWin); - } - - return this.eventsview.provider; - } - }, - defaultTab == eventsId); - } - if (this.target.form.animationsActor) { this.sidebar.addFrameTab( "animationinspector", diff --git a/devtools/client/inspector/moz.build b/devtools/client/inspector/moz.build index eca756904e7b..e25fd02bb85d 100644 --- a/devtools/client/inspector/moz.build +++ b/devtools/client/inspector/moz.build @@ -7,7 +7,6 @@ DIRS += [ 'changes', 'components', 'computed', - 'events', 'extensions', 'flexbox', 'fonts', diff --git a/devtools/client/inspector/reducers.js b/devtools/client/inspector/reducers.js index ed723f921b67..87aa4029fb2f 100644 --- a/devtools/client/inspector/reducers.js +++ b/devtools/client/inspector/reducers.js @@ -9,7 +9,6 @@ exports.boxModel = require("devtools/client/inspector/boxmodel/reducers/box-model"); exports.changes = require("devtools/client/inspector/changes/reducers/changes"); -exports.events = require("devtools/client/inspector/events/reducers/events"); exports.extensionsSidebar = require("devtools/client/inspector/extensions/reducers/sidebar"); exports.flexboxes = require("devtools/client/inspector/flexbox/reducers/flexboxes"); exports.fontOptions = require("devtools/client/inspector/fonts/reducers/font-options"); diff --git a/devtools/client/locales/en-US/inspector.properties b/devtools/client/locales/en-US/inspector.properties index d7d1725c8cd0..05a68cb8f78a 100644 --- a/devtools/client/locales/en-US/inspector.properties +++ b/devtools/client/locales/en-US/inspector.properties @@ -354,11 +354,6 @@ inspector.sidebar.newBadge=new! # that corresponds to the tool displaying CSS changes. inspector.sidebar.changesViewTitle=Changes -# LOCALIZATION NOTE (inspector.sidebar.eventsViewTitle): -# This is the title shown in a tab in the side panel of the Inspector panel -# that corresponds to the tool displaying the list of event listeners used in the page. -inspector.sidebar.eventsViewTitle=Events - # LOCALIZATION NOTE (inspector.sidebar.animationInspectorTitle): # This is the title shown in a tab in the side panel of the Inspector panel # that corresponds to the tool displaying animations defined in the page. diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js index 2b14e5b5d5bb..2689e4b386b7 100644 --- a/devtools/client/preferences/devtools.js +++ b/devtools/client/preferences/devtools.js @@ -62,8 +62,6 @@ pref("devtools.inspector.colorWidget.enabled", false); pref("devtools.inspector.shapesHighlighter.enabled", true); // Enable the Changes View pref("devtools.changesview.enabled", false); -// Enable the Events View -pref("devtools.eventsview.enabled", false); // Enable the Flexbox Inspector pref("devtools.flexboxinspector.enabled", false); diff --git a/devtools/client/shared/browser-loader.js b/devtools/client/shared/browser-loader.js index 4a204507d014..498cfbddeea3 100644 --- a/devtools/client/shared/browser-loader.js +++ b/devtools/client/shared/browser-loader.js @@ -14,7 +14,6 @@ const BROWSER_BASED_DIRS = [ "resource://devtools/client/inspector/boxmodel", "resource://devtools/client/inspector/changes", "resource://devtools/client/inspector/computed", - "resource://devtools/client/inspector/events", "resource://devtools/client/inspector/flexbox", "resource://devtools/client/inspector/fonts", "resource://devtools/client/inspector/grids",