diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js index 6e41ba7d02fe..ea0155840f44 100644 --- a/toolkit/content/aboutTelemetry.js +++ b/toolkit/content/aboutTelemetry.js @@ -1503,72 +1503,6 @@ var KeyValueTable = { } }; -var GenericTable = { - /** - * Returns a n-column table. - * @param rows An array of arrays, each containing data to render - * for one row. - * @param headings The column header strings. - */ - render: function(rows, headings) { - let table = document.createElement("table"); - this.renderHeader(table, headings); - this.renderBody(table, rows); - return table; - }, - - /** - * Create the table header. - * Tabs & newlines added to cells to make it easier to copy-paste. - * - * @param table Table element - * @param headings Array of column header strings. - */ - renderHeader: function(table, headings) { - let headerRow = document.createElement("tr"); - table.appendChild(headerRow); - - for (let i = 0; i < headings.length; ++i) { - let suffix = (i == (headings.length - 1)) ? "\n" : "\t"; - let column = document.createElement("th"); - column.appendChild(document.createTextNode(headings[i] + suffix)); - headerRow.appendChild(column); - } - }, - - /** - * Create the table body - * Tabs & newlines added to cells to make it easier to copy-paste. - * - * @param table Table element - * @param rows An array of arrays, each containing data to render - * for one row. - */ - renderBody: function(table, rows) { - for (let row of rows) { - row = row.map(value => { - // use .valueOf() to unbox Number, String, etc. objects - if (value && - (typeof value == "object") && - (typeof value.valueOf() == "object")) { - return RenderObject(value); - } - return value; - }); - - let newRow = document.createElement("tr"); - table.appendChild(newRow); - - for (let i = 0; i < row.length; ++i) { - let suffix = (i == (row.length - 1)) ? "\n" : "\t"; - let field = document.createElement("td"); - field.appendChild(document.createTextNode(row[i] + suffix)); - newRow.appendChild(field); - } - } - } -}; - var KeyedHistogram = { render: function(parent, id, keyedHistogram) { let outerDiv = document.createElement("div"); @@ -1680,40 +1614,6 @@ var KeyedScalars = { } }; -var Events = { - /** - * Render the event data - if present - from the payload in a simple table. - * @param aPayload A payload object to render the data from. - */ - render: function(aPayload) { - let eventsSection = document.getElementById("events"); - removeAllChildNodes(eventsSection); - - if (!aPayload.processes || !aPayload.processes.parent) { - return; - } - - const events = aPayload.processes.parent.events; - const hasData = events && Object.keys(events).length > 0; - setHasData("events-section", hasData); - if (!hasData) { - return; - } - - const headings = [ - "timestampHeader", - "categoryHeader", - "methodHeader", - "objectHeader", - "valuesHeader", - "extraHeader", - ].map(h => bundle.GetStringFromName(h)); - - const table = GenericTable.render(events, headings); - eventsSection.appendChild(table); - } -}; - /** * Helper function for showing either the toggle element or "No data collected" message for a section * @@ -2151,9 +2051,6 @@ function displayPingData(ping, updatePayloadList = false) { setHasData("keyed-histograms-section", hasData || keyedHgramsSelect.options.length); } - // Show event data. - Events.render(payload); - // Show addon histogram data let addonDiv = document.getElementById("addon-histograms"); removeAllChildNodes(addonDiv); diff --git a/toolkit/content/aboutTelemetry.xhtml b/toolkit/content/aboutTelemetry.xhtml index 05cbba21a485..de1f5cf8c1e6 100644 --- a/toolkit/content/aboutTelemetry.xhtml +++ b/toolkit/content/aboutTelemetry.xhtml @@ -180,15 +180,6 @@ -
- -

&aboutTelemetry.eventsSection;

- &aboutTelemetry.toggle; - &aboutTelemetry.emptySection; -
-
-
-

&aboutTelemetry.simpleMeasurementsSection;

diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd index 8fa8f76a5935..4a08de8caba2 100644 --- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd @@ -116,10 +116,6 @@ Ping Keyed Histograms "> - - diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties index 2d2d1bbe4081..c649c8082de2 100644 --- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties +++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties @@ -81,13 +81,3 @@ parentPayload = Parent Payload # Note to translators: # - The %1$S will be replaced with the number of the child payload (e.g. "1", "2") childPayloadN = Child Payload %1$S - -timestampHeader = timestamp - -categoryHeader = category - -methodHeader = method - -objectHeader = object - -extraHeader = extra