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

Bug 1409208 (part 1) - Create a functional disconnect dialog. r=eoger,gandalf

Browse Source 
MozReview-Commit-ID: GyGzB6pI0vU

--HG--
extra : rebase_source : cdbafbf484ae1aa451132b2c3a31b7210d48c0c4
This commit is contained in:
Mark Hammond 2018-04-24 11:17:00 +10:00
parent 9fadc5a5e8
commit 01238ca16a
8 changed files with 200 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/preferences/in-content/jar.mn
View File

@ -14,4 +14,6 @@ browser.jar:
content/browser/preferences/in-content/privacy.js
content/browser/preferences/in-content/containers.js
content/browser/preferences/in-content/sync.js
content/browser/preferences/in-content/syncDisconnect.xul
content/browser/preferences/in-content/syncDisconnect.js
content/browser/preferences/in-content/findInPage.js

42
browser/components/preferences/in-content/sync.js
View File

@ -448,34 +448,24 @@ var gSyncPane = {
},
unlinkFirefoxAccount(confirm) {
let doUnlink = () => {
fxAccounts.signOut().then(() => {
this.updateWeavePrefs();
});
};
if (confirm) {
let sb = Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
let disconnectLabel = sb.GetStringFromName("disconnect.label");
let title = sb.GetStringFromName("disconnect.verify.title");
let body = sb.GetStringFromName("disconnect.verify.bodyHeading") +
"\n\n" +
sb.GetStringFromName("disconnect.verify.bodyText");
let ps = Services.prompt;
let buttonFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING) +
(ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL) +
ps.BUTTON_POS_1_DEFAULT;
let factory = Cc["@mozilla.org/prompter;1"]
.getService(Ci.nsIPromptFactory);
let prompt = factory.getPrompt(window, Ci.nsIPrompt);
let bag = prompt.QueryInterface(Ci.nsIWritablePropertyBag2);
bag.setPropertyAsBool("allowTabModal", true);
let pressed = prompt.confirmEx(title, body, buttonFlags,
disconnectLabel, null, null, null, {});
if (pressed != 0) { // 0 is the "continue" button
return;
}
gSubDialog.open("chrome://browser/content/preferences/in-content/syncDisconnect.xul",
"resizable=no", /* aFeatures */
null, /* aParams */
event => { /* aClosingCallback */
if (event.detail.button == "accept") {
doUnlink();
}
});
return;
}
fxAccounts.signOut().then(() => {
this.updateWeavePrefs();
});
// no confirmation implies no data removal, so just disconnect.
doUnlink();
},
_populateComputerName(value) {

45
browser/components/preferences/in-content/syncDisconnect.js Normal file
View File

@ -0,0 +1,45 @@
// 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/.
let gSyncDisconnectDialog = {
init() {
},
// when either of the checkboxes are changed.
onDeleteOptionChange() {
let eitherChecked = document.getElementById("deleteRemoteSyncData").checked ||
document.getElementById("deleteRemoteOtherData").checked;
let newTitle = eitherChecked ? "sync-disconnect-confirm-disconnect-delete" :
"sync-disconnect-confirm-disconnect";
let butDisconnect = document.getElementById("butDisconnect");
document.l10n.setAttributes(butDisconnect, newTitle);
},
accept(event) {
// * Check the check-boxes
// * Start the disconnect and get the completion promise.
this.waitForCompletion(Promise.resolve());
},
waitForCompletion(promiseComplete) {
// Change the dialog to show we are waiting for completion.
document.getElementById("deleteOptionsContent").hidden = true;
document.getElementById("deletingContent").hidden = false;
// And do the santize.
promiseComplete.catch(ex => {
console.error("Failed to sanitize", ex);
}).then(() => {
// We dispatch a custom event so the caller knows how we were closed
// (if we were a dialog we'd get this for free, but we'd also lose the
// ability to keep the dialog open while the sanitize was running)
let closingEvent = new CustomEvent("dialogclosing", {
bubbles: true,
detail: {button: "accept"},
});
document.documentElement.dispatchEvent(closingEvent);
close();
});
}
};

67
browser/components/preferences/in-content/syncDisconnect.xul Normal file
View File

@ -0,0 +1,67 @@
<?xml version="1.0"?>
<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
<!-- 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/. -->
<?xml-stylesheet href="chrome://global/skin/"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/syncDisconnect.css" type="text/css"?>
<window id="syncDisconnectDialog" class="windowDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
role="dialog"
onload="gSyncDisconnectDialog.init();"
data-l10n-id="sync-disconnect-dialog"
data-l10n-attrs="title, style">
<link rel="localization" href="browser/branding/sync-brand.ftl"/>
<link rel="localization" href="browser/preferences/syncDisconnect.ftl"/>
<script src="chrome://global/content/l10n.js"/>
<script src="chrome://browser/content/preferences/in-content/syncDisconnect.js"/>
<vbox id="deleteOptionsContent">
<description id="syncDisconnectHeading" data-l10n-id="sync-disconnect-heading"></description>
<vbox class="deleteOptions">
<hbox class="deleteOption">
<checkbox id="deleteRemoteSyncData"
oncommand="gSyncDisconnectDialog.onDeleteOptionChange(event)"/>
<vbox>
<label class="deleteCaption" data-l10n-id="sync-disconnect-remove-sync-caption"/>
<label class="deleteData" data-l10n-id="sync-disconnect-remove-sync-data"/>
</vbox>
</hbox>
<hbox class="deleteOption">
<checkbox id="deleteRemoteOtherData"
oncommand="gSyncDisconnectDialog.onDeleteOptionChange(event)"/>
<vbox>
<label class="deleteCaption" data-l10n-id="sync-disconnect-remove-other-caption"/>
<label class="deleteData" data-l10n-id="sync-disconnect-remove-other-data"/>
</vbox>
</hbox>
</vbox>
<vbox>
<spacer flex="1"/>
<hbox class="actionButtons" align="right" flex="1">
<button id="butCancel"
oncommand="close(event);"
class="syncDisconnectButton"
data-l10n-id="sync-disconnect-cancel"/>
<button id="butDisconnect"
oncommand="gSyncDisconnectDialog.accept(event);"
class="syncDisconnectButton"
data-l10n-id="sync-disconnect-confirm-disconnect"/>
</hbox>
</vbox>
</vbox>
<vbox id="deletingContent" align="center" pack="center" flex="1" hidden="true">
<hbox align="center">
<image class="disconnectThrobber"/>
<label class="deleteCaption" data-l10n-id="sync-disconnect-disconnecting"/>
</hbox>
</vbox>
</window>

36
browser/locales/en-US/browser/preferences/syncDisconnect.ftl Normal file
View File

@ -0,0 +1,36 @@
# 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/.
sync-disconnect-dialog =
.title = Disconnect { -sync-brand-short-name }?
.style = width: 36em; min-height: 35em;
sync-disconnect-heading = Do you also want to remove browser data on this computer? Your { -sync-brand-name } data will remain in your account, regardless.
sync-disconnect-remove-sync-caption = Remove { -sync-brand-name } Data
sync-disconnect-remove-sync-data = Bookmarks, history, passwords, etc.
sync-disconnect-remove-other-caption = Remove Other Private Data
sync-disconnect-remove-other-data = Cookies, cache, offline website data, etc.
# Shown while the disconnect is in progress
sync-disconnect-disconnecting = Disconnecting…
sync-disconnect-cancel =
.label = Cancel
.accesskey = C
## Disconnect confirm Button
##
## The 2 labels which may be shown on the single "Disconnect" button, depending
## on the state of the checkboxes.
sync-disconnect-confirm-disconnect-delete =
.label = Disconnect & Delete
.accesskey = D
sync-disconnect-confirm-disconnect =
.label = Just Disconnect
.accesskey = D

8
browser/locales/en-US/chrome/browser/syncSetup.properties
View File

@ -8,14 +8,6 @@
# Firefox Accounts based setup.
continue.label = Continue
# LOCALIZATION NOTE (disconnect.label, disconnect.verify.title, disconnect.verify.bodyHeading, disconnect.verify.bodyText):
# These strings are used in the confirmation dialog shown when the user hits the disconnect button
# LOCALIZATION NOTE (disconnect.label): This is the label for the disconnect button
disconnect.label = Disconnect
disconnect.verify.title = Disconnect
disconnect.verify.bodyHeading = Disconnect from Sync?
disconnect.verify.bodyText = Your browsing data will remain on this computer, but it will no longer sync with your account.
relinkVerify.title = Merge Warning
relinkVerify.heading = Are you sure you want to sign in to Sync?
# LOCALIZATION NOTE (relinkVerify.description): Email address of a user previously signed into sync.

33
browser/themes/shared/incontentprefs/syncDisconnect.css Normal file
View File

@ -0,0 +1,33 @@
/* 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/. */
#syncDisconnectDialog {
padding: 0.5em;
}
#syncDisconnectHeading {
padding-bottom: 1em;
}
.deleteOptions {
border: thin solid lightgray;
padding: 1em;
}
.deleteOption {
padding-bottom: 1em;
}
.deleteData {
color: gray;
}
.disconnectThrobber {
width: 16px;
min-height: 16px;
margin-inline-end: 8px;
margin-top: 7px;
margin-bottom: 7px;
list-style-image: url("chrome://global/skin/icons/loading.png");
}

1
browser/themes/shared/jar.inc.mn
View File

@ -107,6 +107,7 @@
skin/classic/browser/preferences/in-content/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css)
skin/classic/browser/preferences/in-content/sync-devices.svg (../shared/incontentprefs/sync-devices.svg)
skin/classic/browser/preferences/in-content/sync.svg (../shared/incontentprefs/sync.svg)
skin/classic/browser/preferences/in-content/syncDisconnect.css (../shared/incontentprefs/syncDisconnect.css)
* skin/classic/browser/preferences/in-content/containers.css (../shared/incontentprefs/containers.css)
* skin/classic/browser/preferences/containers.css (../shared/preferences/containers.css)
skin/classic/browser/fxa/default-avatar.svg (../shared/fxa/default-avatar.svg)