From 917cf0bf5d248469a5ce464cf0bba1cfd1ab9d50 Mon Sep 17 00:00:00 2001
From: blackle <isabelle@blackle-mori.com>
Date: Mon, 9 Jan 2017 22:40:45 -0500
Subject: [PATCH] simplify emojification on public pages with .emojify class
---
app/assets/javascripts/extras.jsx | 2 +-
app/views/accounts/_grid_card.html.haml | 4 ++--
app/views/accounts/_header.html.haml | 4 ++--
app/views/authorize_follow/_card.html.haml | 4 ++--
app/views/stream_entries/_detailed_status.html.haml | 4 ++--
app/views/stream_entries/_favourite.html.haml | 2 +-
app/views/stream_entries/_follow.html.haml | 2 +-
app/views/stream_entries/_simple_status.html.haml | 4 ++--
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/app/assets/javascripts/extras.jsx b/app/assets/javascripts/extras.jsx
index c1df182dea..5738863ddd 100644
--- a/app/assets/javascripts/extras.jsx
+++ b/app/assets/javascripts/extras.jsx
@@ -1,7 +1,7 @@
import emojify from './components/emoji'
$(() => {
- $.each($('.entry .content, .entry .status__content, .status__display-name, .display-name, .name, .account__header__content'), (_, content) => {
+ $.each($('.emojify'), (_, content) => {
const $content = $(content);
$content.html(emojify($content.html()));
});
diff --git a/app/views/accounts/_grid_card.html.haml b/app/views/accounts/_grid_card.html.haml
index dfdb231611..d5418fca5a 100644
--- a/app/views/accounts/_grid_card.html.haml
+++ b/app/views/accounts/_grid_card.html.haml
@@ -3,6 +3,6 @@
.avatar= image_tag account.avatar.url(:original)
.name
= link_to TagManager.instance.url_for(account) do
- %span.display_name= display_name(account)
+ %span.display_name.emojify= display_name(account)
%span.username= "@#{account.acct}"
- %p.note= truncate(strip_tags(account.note), length: 150)
+ %p.note.emojify= truncate(strip_tags(account.note), length: 150)
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 7a5cea7abc..f575e855e0 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -11,13 +11,13 @@
= link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button'
.avatar= image_tag @account.avatar.url(:original), class: 'u-photo'
%h1.name
- %span.p-name= display_name(@account)
+ %span.p-name.emojify= display_name(@account)
%small
%span.p-nickname= "@#{@account.username}"
= fa_icon('lock') if @account.locked?
.details
.bio
- .account__header__content.p-note= Formatter.instance.simplified_format(@account)
+ .account__header__content.p-note.emojify= Formatter.instance.simplified_format(@account)
.details-counters
.counter{ class: active_nav_class(account_url(@account)) }
diff --git a/app/views/authorize_follow/_card.html.haml b/app/views/authorize_follow/_card.html.haml
index a9b02c7461..eef0bec07c 100644
--- a/app/views/authorize_follow/_card.html.haml
+++ b/app/views/authorize_follow/_card.html.haml
@@ -4,8 +4,8 @@
= image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar'
%span.display-name
- %strong= display_name(account)
+ %strong.emojify= display_name(account)
%span= "@#{account.acct}"
- unless account.note.blank?
- .account__header__content= Formatter.instance.simplified_format(account)
+ .account__header__content.emojify= Formatter.instance.simplified_format(account)
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index b0d36872cf..32f7c2e40b 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -4,10 +4,10 @@
%div.avatar
= image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'u-photo'
%span.display-name
- %strong.p-name= display_name(status.account)
+ %strong.p-name.emojify= display_name(status.account)
%span.p-nickname= acct(status.account)
- .status__content.e-content.p-name= Formatter.instance.format(status)
+ .status__content.e-content.p-name.emojify= Formatter.instance.format(status)
- unless status.media_attachments.empty?
- if status.media_attachments.first.video?
diff --git a/app/views/stream_entries/_favourite.html.haml b/app/views/stream_entries/_favourite.html.haml
index aac90dcdf8..ea48793285 100644
--- a/app/views/stream_entries/_favourite.html.haml
+++ b/app/views/stream_entries/_favourite.html.haml
@@ -1,5 +1,5 @@
.entry.entry-favourite
- .content
+ .content.emojify
%strong= favourite.account.acct
= t('stream_entries.favourited')
%strong= favourite.status.account.acct
diff --git a/app/views/stream_entries/_follow.html.haml b/app/views/stream_entries/_follow.html.haml
index 1a2e2c5541..da6d062f0f 100644
--- a/app/views/stream_entries/_follow.html.haml
+++ b/app/views/stream_entries/_follow.html.haml
@@ -1,5 +1,5 @@
.entry.entry-follow
- .content
+ .content.emojify
%strong= link_to follow.account.acct, account_path(follow.account)
= t('stream_entries.is_now_following')
%strong= link_to follow.target_account.acct, TagManager.instance.url_for(follow.target_account)
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index b08cf5dab9..eba2f9ac41 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -9,10 +9,10 @@
%div
= image_tag status.account.avatar(:original), width: 48, height: 48, alt: '', class: 'u-photo'
%span.display-name
- %strong.p-name= display_name(status.account)
+ %strong.p-name.emojify= display_name(status.account)
%span.p-nickname= acct(status.account)
- .status__content.e-content.p-name= Formatter.instance.format(status)
+ .status__content.e-content.p-name.emojify= Formatter.instance.format(status)
- unless status.media_attachments.empty?
.status__attachments
--
GitLab