From 83aa20ccfdbbdfdbaa0f4c64940081254ecbfc60 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Mon, 26 Sep 2016 19:35:21 -0700 Subject: [PATCH] Backed out changeset 7b9eac460383 (bug 512479) for browser_aboutCrashes.js failures --- toolkit/crashreporter/content/crashes.js | 7 +--- toolkit/crashreporter/content/crashes.xhtml | 37 ++++++------------- .../locales/en-US/crashreporter/crashes.dtd | 7 +--- 3 files changed, 15 insertions(+), 36 deletions(-) diff --git a/toolkit/crashreporter/content/crashes.js b/toolkit/crashreporter/content/crashes.js index 8a489fcf8e6a..9020166e0a40 100644 --- a/toolkit/crashreporter/content/crashes.js +++ b/toolkit/crashreporter/content/crashes.js @@ -80,6 +80,7 @@ function populateReportList() { var formatter = Cc["@mozilla.org/intl/scriptabledateformat;1"]. createInstance(Ci.nsIScriptableDateFormat); + var body = document.getElementById("tbody"); var ios = Cc["@mozilla.org/network/io-service;1"]. getService(Ci.nsIIOService); var reportURI = ios.newURI(reportURL, null, null); @@ -119,11 +120,7 @@ function populateReportList() { date.getSeconds()); cell.appendChild(document.createTextNode(timestr)); row.appendChild(cell); - if (reports[i].pending) { - document.getElementById("unsubmitted").appendChild(row); - } else { - document.getElementById("submitted").appendChild(row); - } + body.appendChild(row); } } diff --git a/toolkit/crashreporter/content/crashes.xhtml b/toolkit/crashreporter/content/crashes.xhtml index f78f45067621..13d8d7e5ecee 100644 --- a/toolkit/crashreporter/content/crashes.xhtml +++ b/toolkit/crashreporter/content/crashes.xhtml @@ -89,33 +89,18 @@ td:last-child { +

&crashes.title;

-
-

&crashesUnsubmitted.label;

- - - - - - - - - -
&id.heading;&dateCrashed.heading;
-
-
-

&crashesSubmitted.label;

- - - - - - - - - -
&id.heading;&dateSubmitted.heading;
-
+ + + + + + + + + +
&id.heading;&date.heading;
diff --git a/toolkit/locales/en-US/crashreporter/crashes.dtd b/toolkit/locales/en-US/crashreporter/crashes.dtd index c4ab684e31e2..62da4d55fbb2 100644 --- a/toolkit/locales/en-US/crashreporter/crashes.dtd +++ b/toolkit/locales/en-US/crashreporter/crashes.dtd @@ -2,12 +2,9 @@ - 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/. --> - - - + - - + breakpad.reportURL must be set.">