Bug 1382604 - Remove old-event-emitter usage from scratchpad; r=jryans.

Usage was removed from devtools/client/framework/sidebar as well since it emits
events with the parent component.

MozReview-Commit-ID: 24LLmnSZ89I

--HG--
extra : rebase_source : 3ede287d862c80817fe4767e8d029dda26cbb58b

devtools/client/framework/sidebar.js

@@ -6,7 +6,7 @@
 
 var Services = require("Services");
 var {Task} = require("devtools/shared/task");
-var EventEmitter = require("devtools/shared/old-event-emitter");
+var EventEmitter = require("devtools/shared/event-emitter");
 var Telemetry = require("devtools/client/shared/telemetry");
 
 const {LocalizationHelper} = require("devtools/shared/l10n");

devtools/client/framework/test/browser_toolbox_sidebar.js

@@ -48,30 +48,30 @@ function test() {
       let tabbox = panel.panelDoc.getElementById("sidebar");
       panel.sidebar = new ToolSidebar(tabbox, panel, "testbug865688", true);
 
-      panel.sidebar.on("new-tab-registered", function (event, id) {
+      panel.sidebar.on("new-tab-registered", function (id) {
         registeredTabs[id] = true;
       });
 
-      panel.sidebar.once("tab1-ready", function (event) {
-        info(event);
+      panel.sidebar.once("tab1-ready", function () {
+        info("tab1-ready");
         readyTabs.tab1 = true;
         allTabsReady(panel);
       });
 
-      panel.sidebar.once("tab2-ready", function (event) {
-        info(event);
+      panel.sidebar.once("tab2-ready", function () {
+        info("tab2-ready");
         readyTabs.tab2 = true;
         allTabsReady(panel);
       });
 
-      panel.sidebar.once("tab3-ready", function (event) {
-        info(event);
+      panel.sidebar.once("tab3-ready", function () {
+        info("tab3-ready");
         readyTabs.tab3 = true;
         allTabsReady(panel);
       });
 
-      panel.sidebar.once("tab1-selected", function (event) {
-        info(event);
+      panel.sidebar.once("tab1-selected", function () {
+        info("tab1-selected");
         tab1Selected = true;
         allTabsReady(panel);
       });
@@ -127,8 +127,8 @@ function test() {
   }
 
   function testRemoval(panel) {
-    panel.sidebar.once("tab-unregistered", function (event, id) {
-      info(event);
+    panel.sidebar.once("tab-unregistered", function (id) {
+      info("tab-unregistered");
       registeredTabs[id] = false;
 
       is(id, "tab3", "The right tab must be removed");

devtools/client/framework/test/browser_toolbox_sidebar_events.js

@@ -39,23 +39,23 @@ function test() {
       let panel = toolbox.getPanel(toolDefinition.id);
       ok(true, "Tool open");
 
-      panel.once("sidebar-created", function (event, id) {
-        collectedEvents.push(event);
+      panel.once("sidebar-created", function () {
+        collectedEvents.push("sidebar-created");
       });
 
-      panel.once("sidebar-destroyed", function (event, id) {
-        collectedEvents.push(event);
+      panel.once("sidebar-destroyed", function () {
+        collectedEvents.push("sidebar-destroyed");
       });
 
       let tabbox = panel.panelDoc.getElementById("sidebar");
       panel.sidebar = new ToolSidebar(tabbox, panel, "testbug1072208", true);
 
-      panel.sidebar.once("show", function (event, id) {
-        collectedEvents.push(event);
+      panel.sidebar.once("show", function () {
+        collectedEvents.push("show");
       });
 
-      panel.sidebar.once("hide", function (event, id) {
-        collectedEvents.push(event);
+      panel.sidebar.once("hide", function () {
+        collectedEvents.push("hide");
       });
 
       panel.sidebar.once("tab1-selected", () => finishUp(panel));

devtools/client/scratchpad/scratchpad-panel.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const {Cu} = require("chrome");
-const EventEmitter = require("devtools/shared/old-event-emitter");
+const EventEmitter = require("devtools/shared/event-emitter");
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
 

devtools/client/scratchpad/scratchpad.js

@@ -43,7 +43,7 @@ const {require, loader} = ChromeUtils.import("resource://devtools/shared/Loader.
 
 const Editor = require("devtools/client/sourceeditor/editor");
 const TargetFactory = require("devtools/client/framework/target").TargetFactory;
-const EventEmitter = require("devtools/shared/old-event-emitter");
+const EventEmitter = require("devtools/shared/event-emitter");
 const {DevToolsWorker} = require("devtools/shared/worker/worker");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const flags = require("devtools/shared/flags");