Bug 658555 - Make deleteFromSitesList select the "All Sites" entry rather than hiding stuff manually. r=gavin

This commit is contained in:
Margaret Leibovic 2011-05-20 11:10:33 -07:00
parent bfb9019adf
commit 16c4bb7695
3 changed files with 10 additions and 8 deletions

View File

@ -587,12 +587,10 @@ let AboutPermissions = {
for each (let site in this._sites) {
if (site.host.hasRootDomain(aHost)) {
if (site == this._selectedSite) {
// Clear site data from the DOM to maximize privacy.
document.getElementById("site-label").value = "";
document.getElementById("permissions-box").hidden = true;
this._selectedSite = null;
// Replace site-specific interface with "All Sites" interface.
this.sitesList.selectedItem = document.getElementById("all-sites-item");
}
this.sitesList.removeChild(site.listitem);
delete this._sites[site.host];
}
@ -604,6 +602,8 @@ let AboutPermissions = {
*/
onSitesListSelect: function(event) {
if (event.target.selectedItem.id == "all-sites-item") {
// Clear the header label value from the previously selected site.
document.getElementById("site-label").value = "";
this.manageDefaultPermissions();
return;
}
@ -641,8 +641,6 @@ let AboutPermissions = {
this.updatePasswordsCount();
this.updateCookiesCount();
document.getElementById("permissions-box").hidden = false;
},
/**

View File

@ -74,7 +74,7 @@
</richlistbox>
</vbox>
<vbox id="permissions-box" hidden="true" flex="1">
<vbox id="permissions-box" flex="1">
<deck id="header-deck">
<hbox id="site-header" class="pref-item" align="center">

View File

@ -240,6 +240,10 @@ var tests = [
is(gSiteLabel.value, "", "site label cleared");
let allSitesItem = gBrowser.contentDocument.getElementById("all-sites-item");
is(gSitesList.selectedItem, allSitesItem,
"all sites item selected after forgetting selected site");
// check to make sure site is gone from sites list
let testSiteItem = getSiteItem(TEST_URI_2.host);
ok(!testSiteItem, "site removed from sites list");