Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset c45bc43fd660 (bug 1366575) for eslint failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2017-06-12 12:40:10 +02:00
parent abac85f1d9
commit 07c3b0c166
2 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
toolkit/content/aboutSupport.js
View File

@ -993,7 +993,7 @@ function populateActionBox() {
$("reset-box").style.display = "block";
$("action-box").style.display = "block";
}
if (!Services.appinfo.inSafeMode && AppConstants.platform !== "android") {
if (!Services.appinfo.inSafeMode) {
$("safe-mode-box").style.display = "block";
$("action-box").style.display = "block";
}
@ -1013,31 +1013,13 @@ function safeModeRestart() {
* Set up event listeners for buttons.
*/
function setupEventListeners() {
if (AppConstants.platform !== "android"){
$("show-update-history-button").addEventListener("click", function(event) {
var prompter = Cc["@mozilla.org/updates/update-prompt;1"].createInstance(Ci.nsIUpdatePrompt);
$("show-update-history-button").addEventListener("click", function(event) {
var prompter = Cc["@mozilla.org/updates/update-prompt;1"].createInstance(Ci.nsIUpdatePrompt);
prompter.showUpdateHistory(window);
});
$("reset-box-button").addEventListener("click", function(event) {
ResetProfile.openConfirmationDialog(window);
});
$("restart-in-safe-mode-button").addEventListener("click", function(event) {
if (Services.obs.enumerateObservers("restart-in-safe-mode").hasMoreElements()) {
Services.obs.notifyObservers(null, "restart-in-safe-mode");
} else {
safeModeRestart();
}
});
$("verify-place-integrity-button").addEventListener("click", function(event) {
PlacesDBUtils.checkAndFixDatabase().then((tasksStatusMap) => {
let msg = PlacesDBUtils.getLegacyLog(tasksStatusMap).join("\n");
$("verify-place-result").style.display = "block";
$("verify-place-result").classList.remove("no-copy");
$("verify-place-result").textContent = msg;
});
});
}
});
$("reset-box-button").addEventListener("click", function(event) {
ResetProfile.openConfirmationDialog(window);
});
$("copy-raw-data-to-clipboard").addEventListener("click", function(event) {
copyRawDataToClipboard(this);
});
@ -1047,4 +1029,19 @@ function setupEventListeners() {
$("profile-dir-button").addEventListener("click", function(event) {
openProfileDirectory();
});
$("restart-in-safe-mode-button").addEventListener("click", function(event) {
if (Services.obs.enumerateObservers("restart-in-safe-mode").hasMoreElements()) {
Services.obs.notifyObservers(null, "restart-in-safe-mode");
} else {
safeModeRestart();
}
});
$("verify-place-integrity-button").addEventListener("click", function(event) {
PlacesDBUtils.checkAndFixDatabase().then((tasksStatusMap) => {
let msg = PlacesDBUtils.getLegacyLog(tasksStatusMap).join("\n");
$("verify-place-result").style.display = "block";
$("verify-place-result").classList.remove("no-copy");
$("verify-place-result").textContent = msg;
});
});
}

2
toolkit/content/aboutSupport.xhtml
View File

@ -470,7 +470,6 @@
</tbody>
</table>
#ifndef ANDROID
<!-- - - - - - - - - - - - - - - - - - - - - -->
<h2 class="major-section">
@ -491,7 +490,6 @@
</td>
</tr>
</table>
#endif
<!-- - - - - - - - - - - - - - - - - - - - - -->
<h2 class="major-section">