wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1023734 - make show() method sane and remove hide() method in about:accounts. r=ttaubert

Browse Source
This commit is contained in:
Mark Hammond 2014-06-12 13:01:04 +10:00
parent 03b6cb112d
commit e5f8195ef1
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
browser/base/content/aboutaccounts/aboutaccounts.js
View File

@ -170,7 +170,7 @@ let wrapper = {
// If the user data is verified, we want it to immediately look like
// they are signed in without waiting for messages to bounce around.
if (accountData.verified) {
showManage();
show("stage", "manage");
}
this.injectData("message", { status: "login" });
// until we sort out a better UX, just leave the jelly page in place.
@ -270,8 +270,6 @@ function handleOldSync() {
}
function getStarted() {
hide("intro");
hide("stage");
show("remote");
}
@ -289,7 +287,7 @@ function init() {
if (window.location.href.contains("action=signin")) {
if (user) {
// asking to sign-in when already signed in just shows manage.
showManage();
show("stage", "manage");
} else {
show("remote");
wrapper.init(fxAccounts.getAccountsSignInURI());
@ -297,7 +295,7 @@ function init() {
} else if (window.location.href.contains("action=signup")) {
if (user) {
// asking to sign-up when already signed in just shows manage.
showManage();
show("stage", "manage");
} else {
show("remote");
wrapper.init();
@ -314,12 +312,11 @@ function init() {
} else {
// No action specified
if (user) {
showManage();
show("stage", "manage");
let sb = Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
document.title = sb.GetStringFromName("manage.pageTitle");
} else {
show("stage");
show("intro");
show("stage", "intro");
// load the remote frame in the background
wrapper.init();
}
@ -327,18 +324,30 @@ function init() {
});
}
function show(id) {
document.getElementById(id).style.display = 'block';
}
function hide(id) {
document.getElementById(id).style.display = 'none';
}
function showManage() {
show("stage");
show("manage");
hide("remote");
hide("intro");
// Causes the "top-level" element with |id| to be shown - all other top-level
// elements are hidden. Optionally, ensures that only 1 "second-level" element
// inside the top-level one is shown.
function show(id, childId) {
// top-level items are either <div> or <iframe>
let allTop = document.querySelectorAll("body > div, iframe");
for (let elt of allTop) {
if (elt.getAttribute("id") == id) {
elt.style.display = 'block';
} else {
elt.style.display = 'none';
}
}
if (childId) {
// child items are all <div>
let allSecond = document.querySelectorAll("#" + id + " > div");
for (let elt of allSecond) {
if (elt.getAttribute("id") == childId) {
elt.style.display = 'block';
} else {
elt.style.display = 'none';
}
}
}
}
document.addEventListener("DOMContentLoaded", function onload() {