mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 3a362a5d8b87 (bug 1631415) for Newtab failure in activity-stream. CLOSED TREE

This commit is contained in:
Dorel Luca 2020-05-29 22:36:58 +03:00
Родитель 39db8d176f
Коммит ed4a64a653
6 изменённых файлов: 119 добавлений и 116 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
browser/components/newtab/components/CustomElements/paragraph.js
Просмотреть файл

@ -21,14 +21,9 @@
const attributes = {};
for (let name of this.getAttributeNames()) {
if (name.startsWith("fluent-variable-")) {
let value = this.getAttribute(name);
// Attribute value is a string, in some cases that is not useful
// for example instantiating a Date object will fail. We try to
// convert all possible integers back.
if (value.match(/^\d+/)) {
value = parseInt(value, 10);
}
attributes[name.replace(/^fluent-variable-/, "")] = value;
attributes[name.replace(/^fluent-variable-/, "")] = this.getAttribute(
name
);
}
}

4
browser/components/newtab/lib/ASRouter.jsm
Просмотреть файл

@ -1348,7 +1348,6 @@ class _ASRouter {
}
break;
case "cfr_doorhanger":
case "milestone_message":
if (force) {
CFRPageActions.forceRecommendation(target, message, this.dispatch);
} else {
@ -1383,6 +1382,9 @@ class _ASRouter {
case "update_action":
MomentsPageHub.executeAction(message);
break;
case "milestone_message":
CFRPageActions.showMilestone(target, message, this.dispatch, { force });
break;
default:
try {
target.sendAsyncMessage(OUTGOING_MESSAGE_NAME, {

121
browser/components/newtab/lib/CFRPageActions.jsm
Просмотреть файл

@ -307,15 +307,6 @@ class PageAction {
});
}
maybeLoadCustomElement(win) {
if (!win.customElements.get("remote-text")) {
Services.scriptloader.loadSubScript(
"resource://activity-stream/data/custom-elements/paragraph.js",
win
);
}
}
/**
* getStrings - Handles getting the localized strings vs message overrides.
* If string_id is not defined it assumes you passed in an override
@ -517,8 +508,6 @@ class PageAction {
}
async _renderMilestonePopup(message, browser) {
this.maybeLoadCustomElement(this.window);
let { content, id } = message;
let { primary } = content.buttons;
@ -543,18 +532,21 @@ class PageAction {
reachedMilestone = milestone;
}
}
if (headerLabel.firstChild) {
headerLabel.firstChild.remove();
}
headerLabel.appendChild(
RemoteL10n.createElement(this.window.document, "span", {
content: message.content.heading_text,
attributes: {
if (typeof message.content.heading_text === "string") {
// This is a test environment.
panelTitle = message.content.heading_text;
headerLabel.value = panelTitle;
} else {
RemoteL10n.l10n.setAttributes(
headerLabel,
content.heading_text.string_id,
{
blockedCount: reachedMilestone,
date: monthName,
},
})
);
}
);
await RemoteL10n.l10n.translateElements([headerLabel]);
}
// Use the message layout as a CSS selector to hide different parts of the
// notification template markup
@ -639,8 +631,6 @@ class PageAction {
// eslint-disable-next-line max-statements
async _renderPopup(message, browser) {
this.maybeLoadCustomElement(this.window);
const { id, content, modelVersion } = message;
const headerLabel = this.window.document.getElementById(
@ -693,14 +683,7 @@ class PageAction {
const author = this.window.document.getElementById(
"cfr-notification-author"
);
if (author.firstChild) {
author.firstChild.remove();
}
author.appendChild(
RemoteL10n.createElement(this.window.document, "span", {
content: content.text,
})
);
author.textContent = await this.getStrings(content.text);
primaryActionCallback = () => {
this._blockMessage(id);
this.dispatchUserAction(primary.action);
@ -765,13 +748,10 @@ class PageAction {
for (let step of content.descriptionDetails.steps) {
// This li is a generic xul element with custom styling
const li = this.window.document.createXULElement("li");
li.appendChild(
RemoteL10n.createElement(this.window.document, "span", {
content: step,
})
);
RemoteL10n.l10n.setAttributes(li, step.string_id);
stepsContainer.appendChild(li);
}
await RemoteL10n.l10n.translateElements([...stepsContainer.children]);
}
await this._renderPinTabAnimation();
@ -779,15 +759,8 @@ class PageAction {
default:
panelTitle = await this.getStrings(content.addon.title);
await this._setAddonAuthorAndRating(this.window.document, content);
if (footerText.firstChild) {
footerText.firstChild.remove();
}
// Main body content of the dropdown
footerText.appendChild(
RemoteL10n.createElement(this.window.document, "span", {
content: content.text,
})
);
footerText.textContent = await this.getStrings(content.text);
options = { popupIconURL: content.addon.icon };
footerLink.value = await this.getStrings({
@ -1049,6 +1022,46 @@ const CFRPageActions = {
return url;
},
/**
* Show Milestone notification.
* @param browser The browser for the recommendation
* @param recommendation The recommendation to show
* @param dispatchToASRouter A function to dispatch resulting actions to
* @return Did adding the recommendation succeed?
*/
async showMilestone(browser, message, dispatchToASRouter, options = {}) {
let win = null;
const { id, content, personalizedModelVersion } = message;
// If we are forcing via the Admin page, the browser comes in a different format
if (options.force) {
win = browser.browser.ownerGlobal;
RecommendationMap.set(browser.browser, {
id,
content,
retain: true,
modelVersion: personalizedModelVersion,
});
} else {
win = browser.ownerGlobal;
RecommendationMap.set(browser, {
id,
content,
retain: true,
modelVersion: personalizedModelVersion,
});
}
if (!PageActionMap.has(win)) {
PageActionMap.set(win, new PageAction(win, dispatchToASRouter));
}
await PageActionMap.get(win).showMilestonePopup();
PageActionMap.get(win).addImpression(message);
return true;
},
/**
* Force a recommendation to be shown. Should only happen via the Admin page.
* @param browser The browser for the recommendation
@ -1071,13 +1084,8 @@ const CFRPageActions = {
}
if (content.skip_address_bar_notifier) {
if (recommendation.template === "milestone_message") {
await PageActionMap.get(win).showMilestonePopup();
PageActionMap.get(win).addImpression(recommendation);
} else {
await PageActionMap.get(win).showPopup();
PageActionMap.get(win).addImpression(recommendation);
}
await PageActionMap.get(win).showPopup();
PageActionMap.get(win).addImpression(recommendation);
} else {
await PageActionMap.get(win).showAddressBarNotifier(recommendation, true);
}
@ -1121,16 +1129,9 @@ const CFRPageActions = {
}
if (content.skip_address_bar_notifier) {
if (recommendation.template === "milestone_message") {
await PageActionMap.get(win).showMilestonePopup();
PageActionMap.get(win).addImpression(recommendation);
} else {
// Tracking protection messages
await PageActionMap.get(win).showPopup();
PageActionMap.get(win).addImpression(recommendation);
}
await PageActionMap.get(win).showPopup();
PageActionMap.get(win).addImpression(recommendation);
} else {
// Doorhanger messages
await PageActionMap.get(win).showAddressBarNotifier(recommendation, true);
}
return true;

28
browser/components/newtab/lib/RemoteL10n.jsm
Просмотреть файл

@ -27,34 +27,6 @@ class _RemoteL10n {
this._l10n = null;
}
createElement(doc, elem, options = {}) {
let node;
if (options.content && options.content.string_id) {
node = doc.createElement("remote-text");
} else {
node = doc.createElementNS("http://www.w3.org/1999/xhtml", elem);
}
if (options.classList) {
node.classList.add(options.classList);
}
this.setString(node, options);
return node;
}
// If `string_id` is present it means we are relying on fluent for translations.
// Otherwise, we have a vanilla string.
setString(el, { content, attributes = {} }) {
if (content && content.string_id) {
for (let [fluentId, value] of Object.entries(attributes)) {
el.setAttribute(`fluent-variable-${fluentId}`, value);
}
el.setAttribute("fluent-remote-id", content.string_id);
} else {
el.textContent = content;
}
}
/**
* Creates a new DOMLocalization instance with the Fluent file from Remote Settings.
*

63
browser/components/newtab/lib/ToolbarPanelHub.jsm
Просмотреть файл

@ -13,7 +13,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
Preferences: "resource://gre/modules/Preferences.jsm",
SpecialMessageActions:
"resource://messaging-system/lib/SpecialMessageActions.jsm",
RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
this,
@ -268,13 +267,13 @@ class _ToolbarPanelHub {
_createMessageElements(win, doc, message, previousDate) {
const { content } = message;
const messageEl = RemoteL10n.createElement(doc, "div");
const messageEl = this._createElement(doc, "div");
messageEl.classList.add("whatsNew-message");
// Only render date if it is different from the one rendered before.
if (content.published_date !== previousDate) {
messageEl.appendChild(
RemoteL10n.createElement(doc, "p", {
this._createElement(doc, "p", {
classList: "whatsNew-message-date",
content: new Date(content.published_date).toLocaleDateString(
"default",
@ -288,14 +287,14 @@ class _ToolbarPanelHub {
);
}
const wrapperEl = RemoteL10n.createElement(doc, "button");
const wrapperEl = this._createElement(doc, "button");
wrapperEl.doCommand = () => this._dispatchUserAction(win, message);
wrapperEl.classList.add("whatsNew-message-body");
messageEl.appendChild(wrapperEl);
if (content.icon_url) {
wrapperEl.classList.add("has-icon");
const iconEl = RemoteL10n.createElement(doc, "img");
const iconEl = this._createElement(doc, "img");
iconEl.src = content.icon_url;
iconEl.classList.add("whatsNew-message-icon");
if (content.icon_alt && content.icon_alt.string_id) {
@ -309,7 +308,7 @@ class _ToolbarPanelHub {
wrapperEl.appendChild(this._createMessageContent(win, doc, content));
if (content.link_text) {
const anchorEl = RemoteL10n.createElement(doc, "a", {
const anchorEl = this._createElement(doc, "a", {
classList: "text-link",
content: content.link_text,
});
@ -330,39 +329,35 @@ class _ToolbarPanelHub {
const wrapperEl = new win.DocumentFragment();
wrapperEl.appendChild(
RemoteL10n.createElement(doc, "h2", {
this._createElement(doc, "h2", {
classList: "whatsNew-message-title",
content: content.title,
attributes: this.state.contentArguments,
})
);
switch (content.layout) {
case "tracking-protections":
wrapperEl.appendChild(
RemoteL10n.createElement(doc, "h4", {
this._createElement(doc, "h4", {
classList: "whatsNew-message-subtitle",
content: content.subtitle,
attributes: this.state.contentArguments,
})
);
wrapperEl.appendChild(
RemoteL10n.createElement(doc, "h2", {
this._createElement(doc, "h2", {
classList: "whatsNew-message-title-large",
content: this.state.contentArguments[
content.layout_title_content_variable
],
attributes: this.state.contentArguments,
})
);
break;
}
wrapperEl.appendChild(
RemoteL10n.createElement(doc, "p", {
this._createElement(doc, "p", {
content: content.body,
classList: "whatsNew-message-content",
attributes: this.state.contentArguments,
})
);
@ -372,28 +367,28 @@ class _ToolbarPanelHub {
_createHeroElement(win, doc, message) {
this.maybeLoadCustomElement(win);
const messageEl = RemoteL10n.createElement(doc, "div");
const messageEl = this._createElement(doc, "div");
messageEl.setAttribute("id", "protections-popup-message");
messageEl.classList.add("whatsNew-hero-message");
const wrapperEl = RemoteL10n.createElement(doc, "div");
const wrapperEl = this._createElement(doc, "div");
wrapperEl.classList.add("whatsNew-message-body");
messageEl.appendChild(wrapperEl);
wrapperEl.appendChild(
RemoteL10n.createElement(doc, "h2", {
this._createElement(doc, "h2", {
classList: "whatsNew-message-title",
content: message.content.title,
})
);
wrapperEl.appendChild(
RemoteL10n.createElement(doc, "p", {
this._createElement(doc, "p", {
classList: "protections-popup-content",
content: message.content.body,
})
);
if (message.content.link_text) {
let linkEl = RemoteL10n.createElement(doc, "a", {
let linkEl = this._createElement(doc, "a", {
classList: "text-link",
content: message.content.link_text,
});
@ -407,6 +402,21 @@ class _ToolbarPanelHub {
return messageEl;
}
_createElement(doc, elem, options = {}) {
let node;
if (options.content && options.content.string_id) {
node = doc.createElement("remote-text");
} else {
node = doc.createElementNS("http://www.w3.org/1999/xhtml", elem);
}
if (options.classList) {
node.classList.add(options.classList);
}
this._setString(node, options.content);
return node;
}
async _contentArguments() {
const { defaultEngine } = Services.search;
// Between now and 6 weeks ago
@ -448,6 +458,21 @@ class _ToolbarPanelHub {
};
}
// If `string_id` is present it means we are relying on fluent for translations.
// Otherwise, we have a vanilla string.
_setString(el, stringObj) {
if (stringObj && stringObj.string_id) {
for (let [fluentId, value] of Object.entries(
this.state.contentArguments || {}
)) {
el.setAttribute(`fluent-variable-${fluentId}`, value);
}
el.setAttribute("fluent-remote-id", stringObj.string_id);
} else {
el.textContent = stringObj;
}
}
async _showAppmenuButton(win) {
this.maybeInsertFTL(win);
await this._showElement(

8
browser/components/newtab/test/browser/browser_asrouter_cfr.js
Просмотреть файл

@ -195,6 +195,14 @@ function trigger_cfr_panel(
}
clearNotifications();
if (recommendation.template === "milestone_message") {
return CFRPageActions.showMilestone(
browser,
recommendation,
// Use the real AS dispatch method to trigger real notifications
ASRouter.dispatch
);
}
return CFRPageActions.addRecommendation(
browser,
trigger,