Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass data to text method to prevent duplication

This commit is contained in:
Daniel Waterworth 2019-06-07 10:36:21 +01:00 committed by Robin Ward
parent 86d5208b31
commit 8c349101c5
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/widgets/custom-notification-item.js.es6
View File

@ -8,10 +8,7 @@ createWidgetFrom(DefaultNotificationItem, "custom-notification-item", {
return data.title ? I18n.t(data.title) : ""; return data.title ? I18n.t(data.title) : "";
}, },
text(notificationName) { text(notificationName, data) {
const { attrs } = this;
const data = attrs.data;
const username = formatUsername(data.display_username); const username = formatUsername(data.display_username);
const description = this.description(); const description = this.description();

7
app/assets/javascripts/discourse/widgets/default-notification-item.js.es6
View File

@ -79,10 +79,7 @@ export const DefaultNotificationItem =
return Ember.isEmpty(description) ? "" : escapeExpression(description); return Ember.isEmpty(description) ? "" : escapeExpression(description);
}, },
text(notificationName) { text(notificationName, data) {
const { attrs } = this;
const data = attrs.data;
const username = formatUsername(data.display_username); const username = formatUsername(data.display_username);
const description = this.description(); const description = this.description();
@ -107,7 +104,7 @@ export const DefaultNotificationItem =
const notificationName = lookup[notificationType]; const notificationName = lookup[notificationType];
let { data } = attrs; let { data } = attrs;
let text = emojiUnescape(this.text(notificationName)); let text = emojiUnescape(this.text(notificationName, data));
let icon = this.icon(notificationName, data); let icon = this.icon(notificationName, data);
const title = this.title(notificationName, data); const title = this.title(notificationName, data);

4
app/assets/javascripts/discourse/widgets/group-message-summary-notification-item.js.es6
View File

@ -2,9 +2,7 @@ import { createWidgetFrom } from "discourse/widgets/widget";
import { DefaultNotificationItem } from "discourse/widgets/default-notification-item"; import { DefaultNotificationItem } from "discourse/widgets/default-notification-item";
createWidgetFrom(DefaultNotificationItem, "group-message-summary-notification-item", { createWidgetFrom(DefaultNotificationItem, "group-message-summary-notification-item", {
text(notificationName) { text(notificationName, data) {
const { attrs } = this;
const data = attrs.data;
const count = data.inbox_count; const count = data.inbox_count;
const group_name = data.group_name; const group_name = data.group_name;

5
app/assets/javascripts/discourse/widgets/liked-notification-item.js.es6
View File

@ -3,10 +3,7 @@ import { DefaultNotificationItem } from "discourse/widgets/default-notification-
import { formatUsername } from "discourse/lib/utilities"; import { formatUsername } from "discourse/lib/utilities";
createWidgetFrom(DefaultNotificationItem, "liked-notification-item", { createWidgetFrom(DefaultNotificationItem, "liked-notification-item", {
text(notificationName) { text(notificationName, data) {
const { attrs } = this;
const data = attrs.data;
const username = formatUsername(data.display_username); const username = formatUsername(data.display_username);
const description = this.description(); const description = this.description();