Backed out changeset 1034f8be097f (bug 948882) for ESlint failures on crashes.js. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Tue, 19 Jun 2018 13:24:33 +0300
changeset 422947 dfff9e92ca9710b2e56e0a38f86362b7a8903049
parent 422946 c735e33ff04b2a6d72c0101d8676f33cc7a98ec7
child 422948 e962019750e9396af45cb45b7b38fbf046d8c221
push id104398
push userncsoregi@mozilla.com
push dateTue, 19 Jun 2018 10:25:10 +0000
treeherdermozilla-inbound@dfff9e92ca97 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs948882
milestone62.0a1
backs out1034f8be097fd6d2f8eda8f7f7d277b92d91ff41
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1034f8be097f (bug 948882) for ESlint failures on crashes.js. CLOSED TREE
toolkit/crashreporter/content/crashes.css
toolkit/crashreporter/content/crashes.js
toolkit/crashreporter/content/crashes.xhtml
toolkit/crashreporter/jar.mn
deleted file mode 100644
--- a/toolkit/crashreporter/content/crashes.css
+++ /dev/null
@@ -1,69 +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/. */
-
-:root {
-  font-family: sans-serif;
-  margin: 40px auto;
-  min-width: 30em;
-  max-width: 60em;
-}
-table {
-  clear: both;
-  width: 90%;
-  margin: 0 auto;
-  padding-bottom: 2em;
-}
-th {
-  font-size: 130%;
-  text-align: left;
-  white-space: nowrap;
-}
-th[chromedir="rtl"] {
-  text-align: right;
-}
-/* name */
-th:first-child {
-  padding-inline-end: 2em;
-}
-/* submitted */
-th:last-child {
-  text-align: center;
-}
-:link, :visited {
-  display: block;
-  min-height: 17px;
-}
-/* date */
-td:first-child + td {
-  width: 0;
-  padding-inline-start: 1em;
-  padding-inline-end: .5em;
-  white-space: nowrap;
-}
-/* time */
-td:last-child {
-  width: 0;
-  padding-inline-start: .5em;
-  white-space: nowrap;
-}
-
-#clear-reports {
-  float: right;
-}
-#clear-reports[chromedir="rtl"] {
-  float: left;
-}
-
-.submitting {
-  background-image: url(chrome://global/skin/icons/loading.png);
-  background-repeat: no-repeat;
-  background-position: right;
-  background-size: 16px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .submitting {
-    background-image: url(chrome://global/skin/icons/loading@2x.png);
-  }
-}
--- a/toolkit/crashreporter/content/crashes.js
+++ b/toolkit/crashreporter/content/crashes.js
@@ -7,23 +7,16 @@ var reportURL;
 ChromeUtils.import("resource://gre/modules/CrashReports.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
 ChromeUtils.defineModuleGetter(this, "CrashSubmit",
   "resource://gre/modules/CrashSubmit.jsm");
 
-document.addEventListener("DOMContentLoaded", function () {
-  populateReportList();
-  document.getElementById('clear-reports').addEventListener("click", function () {
-    clearReports().then(null, Cu.reportError);
-  });
-});
-
 const buildID = Services.appinfo.appBuildID;
 
 function submitPendingReport(event) {
   let link = event.target;
   let id = link.firstChild.textContent;
   link.className = "submitting";
   CrashSubmit.submit(id, { noThrottle: true }).then(
     (remoteCrashID) => {
--- a/toolkit/crashreporter/content/crashes.xhtml
+++ b/toolkit/crashreporter/content/crashes.xhtml
@@ -9,24 +9,91 @@
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   <!ENTITY % crashesDTD SYSTEM "chrome://global/locale/crashes.dtd">
   %globalDTD;
   %crashesDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<link rel="stylesheet" type="text/css" href="chrome://global/content/crashes.css"/>
+<style type="text/css">
+:root {
+  font-family: sans-serif;
+  margin: 40px auto;
+  min-width: 30em;
+  max-width: 60em;
+}
+table {
+  clear: both;
+  width: 90%;
+  margin: 0 auto;
+  padding-bottom: 2em;
+}
+th {
+  font-size: 130%;
+  text-align: left;
+  white-space: nowrap;
+}
+th[chromedir="rtl"] {
+  text-align: right;
+}
+/* name */
+th:first-child {
+  padding-inline-end: 2em;
+}
+/* submitted */
+th:last-child {
+  text-align: center;
+}
+:link, :visited {
+  display: block;
+  min-height: 17px;
+}
+/* date */
+td:first-child + td {
+  width: 0;
+  padding-inline-start: 1em;
+  padding-inline-end: .5em;
+  white-space: nowrap;
+}
+/* time */
+td:last-child {
+  width: 0;
+  padding-inline-start: .5em;
+  white-space: nowrap;
+}
+
+#clear-reports {
+  float: right;
+}
+#clear-reports[chromedir="rtl"] {
+  float: left;
+}
+
+.submitting {
+  background-image: url(chrome://global/skin/icons/loading.png);
+  background-repeat: no-repeat;
+  background-position: right;
+  background-size: 16px;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .submitting {
+    background-image: url(chrome://global/skin/icons/loading@2x.png);
+  }
+}
+</style>
 <link rel="stylesheet" media="screen, projection" type="text/css"
       href="chrome://global/skin/in-content/common.css"/>
 <script type="application/javascript" src="chrome://global/content/crashes.js"/>
 
 <title>&crashReports.title;</title>
-</head><body dir="&locale.dir;">
-<button chromedir="&locale.dir;" id="clear-reports">&clearAllReports.label;</button>
+</head><body onload="populateReportList()" dir="&locale.dir;">
+<button chromedir="&locale.dir;" id="clear-reports"
+        onclick="clearReports().then(null, Cu.reportError)">&clearAllReports.label;</button>
 <div id="reportList">
   <div id="reportListUnsubmitted">
     <h1>&crashesUnsubmitted.label;</h1>
     <table>
       <thead>
         <tr>
           <th chromedir="&locale.dir;">&id.heading;</th>
           <th chromedir="&locale.dir;" colspan="2">&dateCrashed.heading;</th>
--- a/toolkit/crashreporter/jar.mn
+++ b/toolkit/crashreporter/jar.mn
@@ -1,10 +1,9 @@
 # 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/.
 
 toolkit.jar:
 #ifdef MOZ_CRASHREPORTER
   content/global/crashes.xhtml            (content/crashes.xhtml)
   content/global/crashes.js               (content/crashes.js)
-  content/global/crashes.css              (content/crashes.css)
 #endif