Backed out changeset fe98d700bb64 (bug 1313326)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 01 Mar 2017 19:47:14 +0100
changeset 491179 a756569e4a3c12b7ce5b34ddf9437f7ac64f64bc
parent 491178 6a3af7c0213856d5c8fde04682d99ed2b82db3c1
child 491180 a54020e769ed87a70568aebaf01cbc6aa205b311
push id47336
push userbmo:eoger@fastmail.com
push dateWed, 01 Mar 2017 21:01:30 +0000
bugs1313326
milestone54.0a1
backs outfe98d700bb64c12285d49e4a7cc77473fa72326e
Backed out changeset fe98d700bb64 (bug 1313326)
toolkit/content/aboutTelemetry.js
toolkit/content/aboutTelemetry.xhtml
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -309,18 +309,16 @@ var PingPicker = {
     document.getElementById("scalars-processes")
             .addEventListener("change", () => displayPingData(gPingData));
     document.getElementById("keyed-scalars-processes")
             .addEventListener("change", () => displayPingData(gPingData));
     document.getElementById("histograms-processes")
             .addEventListener("change", () => displayPingData(gPingData));
     document.getElementById("keyed-histograms-processes")
             .addEventListener("change", () => displayPingData(gPingData));
-    document.getElementById("events-processes")
-            .addEventListener("change", () => displayPingData(gPingData));
   },
 
   onPingSourceChanged() {
     this.update();
   },
 
   onPingDisplayChanged() {
     this.update();
@@ -1731,26 +1729,17 @@ var Events = {
   render(aPayload) {
     let eventsSection = document.getElementById("events");
     removeAllChildNodes(eventsSection);
 
     if (!aPayload.processes || !aPayload.processes.parent) {
       return;
     }
 
-    let processesSelect = document.getElementById("events-processes");
-    let selectedProcess = processesSelect.selectedOptions.item(0).getAttribute("value");
-
-    if (!aPayload.processes ||
-        !selectedProcess ||
-        !(selectedProcess in aPayload.processes)) {
-      return;
-    }
-
-    let events = aPayload.processes[selectedProcess].events;
+    const events = aPayload.processes.parent.events;
     const hasData = events && Object.keys(events).length > 0;
     setHasData("events-section", hasData);
     if (!hasData) {
       return;
     }
 
     const headings = [
       "timestampHeader",
@@ -2088,17 +2077,16 @@ function displayPingData(ping, updatePay
 
   // Update the payload list and process lists
   if (updatePayloadList) {
     renderPayloadList(ping);
     renderProcessList(ping, document.getElementById("scalars-processes"));
     renderProcessList(ping, document.getElementById("keyed-scalars-processes"));
     renderProcessList(ping, document.getElementById("histograms-processes"));
     renderProcessList(ping, document.getElementById("keyed-histograms-processes"));
-    renderProcessList(ping, document.getElementById("events-processes"));
   }
 
   // Show general data.
   GeneralData.render(ping);
 
   // Show environment data.
   EnvironmentData.render(ping);
 
--- a/toolkit/content/aboutTelemetry.xhtml
+++ b/toolkit/content/aboutTelemetry.xhtml
@@ -186,19 +186,16 @@
         </div>
       </section>
 
       <section id="events-section" class="data-section">
         <input type="checkbox" class="statebox"/>
         <h1 class="section-name">&aboutTelemetry.eventsSection;</h1>
         <span class="toggle-caption">&aboutTelemetry.toggle;</span>
         <span class="empty-caption">&aboutTelemetry.emptySection;</span>
-        <div class="processes-ui">
-          <select id="events-processes" class="process-picker"></select>
-        </div>
         <div id="events" class="data">
         </div>
       </section>
 
       <section id="simple-measurements-section" class="data-section">
         <input type="checkbox" class="statebox"/>
         <h1 class="section-name">&aboutTelemetry.simpleMeasurementsSection;</h1>
         <span class="toggle-caption">&aboutTelemetry.toggle;</span>