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

Bug 1447952 - Use relative time format in the site data manager. r=johannh

Browse Source
This commit is contained in:
Michael Kohler 2018-05-30 17:46:54 +03:00
parent f4e1a413d6
commit 28a650b6af
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
browser/components/preferences/in-content/tests/siteData/browser_siteData.js
View File

@ -156,19 +156,23 @@ add_task(async function() {
let cookie1 = cookiesEnum1.getNext().QueryInterface(Ci.nsICookie2);
let cookie2 = cookiesEnum2.getNext().QueryInterface(Ci.nsICookie2);
let formatter = new Services.intl.DateTimeFormat(undefined, {
let fullFormatter = new Services.intl.DateTimeFormat(undefined, {
dateStyle: "short", timeStyle: "short",
});
let creationDate1 = formatter.format(new Date(cookie1.lastAccessed / 1000));
let creationDate2 = formatter.format(new Date(cookie2.lastAccessed / 1000));
await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
// Open the site data manager and remove one site.
await openSiteDataSettingsDialog();
let creationDate1 = new Date(cookie1.lastAccessed / 1000);
let creationDate1Formatted = fullFormatter.format(creationDate1);
let creationDate2 = new Date(cookie2.lastAccessed / 1000);
let creationDate2Formatted = fullFormatter.format(creationDate2);
let removeDialogOpenPromise = BrowserTestUtils.promiseAlertDialogOpen("accept", REMOVE_DIALOG_URL);
await ContentTask.spawn(gBrowser.selectedBrowser, {creationDate1, creationDate2}, function(args) {
await ContentTask.spawn(gBrowser.selectedBrowser, {
creationDate1Formatted,
creationDate2Formatted,
}, function(args) {
let frameDoc = content.gSubDialog._topDialog._frame.contentDocument;
let siteItems = frameDoc.getElementsByTagName("richlistitem");
@ -178,16 +182,20 @@ add_task(async function() {
let site2 = sitesList.querySelector(`richlistitem[host="example.org"]`);
let columns = site1.querySelectorAll(".item-box > label");
let boxes = site1.querySelectorAll(".item-box");
is(columns[0].value, "example.com", "Should show the correct host.");
is(columns[1].value, "2", "Should show the correct number of cookies.");
is(columns[2].value, "", "Should show no site data.");
is(columns[3].value, args.creationDate1, "Should show the correct date.");
is(/(now|second)/.test(columns[3].value), true, "Should show the relative date.");
is(boxes[3].getAttribute("tooltiptext"), args.creationDate1Formatted, "Should show the correct date.");
columns = site2.querySelectorAll(".item-box > label");
boxes = site2.querySelectorAll(".item-box");
is(columns[0].value, "example.org", "Should show the correct host.");
is(columns[1].value, "1", "Should show the correct number of cookies.");
is(columns[2].value, "", "Should show no site data.");
is(columns[3].value, args.creationDate2, "Should show the correct date.");
is(/(now|second)/.test(columns[3].value), true, "Should show the relative date.");
is(boxes[3].getAttribute("tooltiptext"), args.creationDate2Formatted, "Should show the correct date.");
let removeBtn = frameDoc.getElementById("removeSelected");
let saveBtn = frameDoc.getElementById("save");
@ -203,7 +211,7 @@ add_task(async function() {
// Open the site data manager and remove another site.
await openSiteDataSettingsDialog();
let acceptRemovePromise = BrowserTestUtils.promiseAlertDialogOpen("accept");
await ContentTask.spawn(gBrowser.selectedBrowser, {creationDate1}, function(args) {
await ContentTask.spawn(gBrowser.selectedBrowser, {creationDate1Formatted}, function(args) {
let frameDoc = content.gSubDialog._topDialog._frame.contentDocument;
let siteItems = frameDoc.getElementsByTagName("richlistitem");
@ -212,10 +220,12 @@ add_task(async function() {
let site1 = sitesList.querySelector(`richlistitem[host="example.com"]`);
let columns = site1.querySelectorAll(".item-box > label");
let boxes = site1.querySelectorAll(".item-box");
is(columns[0].value, "example.com", "Should show the correct host.");
is(columns[1].value, "2", "Should show the correct number of cookies.");
is(columns[2].value, "", "Should show no site data.");
is(columns[3].value, args.creationDate1, "Should show the correct date.");
is(/(now|second)/.test(columns[3].value), true, "Should show the relative date.");
is(boxes[3].getAttribute("tooltiptext"), args.creationDate1Formatted, "Should show the correct date.");
let removeBtn = frameDoc.getElementById("removeSelected");
let saveBtn = frameDoc.getElementById("save");

15
browser/components/preferences/siteDataSettings.js
View File

@ -31,7 +31,7 @@ let gSiteDataSettings = {
let container = document.createElement("hbox");
// Creates a new column item with the specified relative width.
function addColumnItem(l10n, flexWidth) {
function addColumnItem(l10n, flexWidth, tooltipText) {
let box = document.createElement("hbox");
box.className = "item-box";
box.setAttribute("flex", flexWidth);
@ -45,6 +45,9 @@ let gSiteDataSettings = {
document.l10n.setAttributes(label, l10n.id, l10n.args);
}
}
if (tooltipText) {
box.setAttribute("tooltiptext", tooltipText);
}
box.appendChild(label);
container.appendChild(box);
}
@ -69,8 +72,12 @@ let gSiteDataSettings = {
}
// Add "Last Used" column.
let formattedLastAccessed = site.lastAccessed > 0 ?
this._relativeTimeFormat.formatBestUnit(site.lastAccessed) : null;
let formattedFullDate = site.lastAccessed > 0 ?
this._absoluteTimeFormat.format(site.lastAccessed) : null;
addColumnItem(site.lastAccessed > 0 ?
{raw: this._formatter.format(site.lastAccessed)} : null, "2");
{ raw: formattedLastAccessed } : null, "2", formattedFullDate);
item.appendChild(container);
return item;
@ -82,10 +89,12 @@ let gSiteDataSettings = {
.addEventListener(eventType, callback.bind(gSiteDataSettings));
}
this._formatter = new Services.intl.DateTimeFormat(undefined, {
this._absoluteTimeFormat = new Services.intl.DateTimeFormat(undefined, {
dateStyle: "short", timeStyle: "short",
});
this._relativeTimeFormat = new Services.intl.RelativeTimeFormat(undefined, {});
this._list = document.getElementById("sitesList");
this._searchBox = document.getElementById("searchBox");
SiteDataManager.getSites().then(sites => {