tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove wrong emojify usage in old glitch components

Browse Source
This commit is contained in:
Ondřej Hruška
2017-09-28 11:03:23 +02:00
parent 74e4fc8f8a
commit cf24ce7e03
4 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/glitch/components/status/content.js
View File

@@ -1,13 +1,11 @@
// Package imports //
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import escapeTextContentForBrowser from 'escape-html';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import classnames from 'classnames';
// Mastodon imports //
import emojify from '../../../mastodon/emoji';
import { isRtl } from '../../../mastodon/rtl';
import Permalink from '../../../mastodon/components/permalink';
@@ -32,7 +30,7 @@ export default class StatusContent extends React.PureComponent {
const node = this.node;
const links = node.querySelectorAll('a');
for (var i = 0; i < links.length; ++i) {
for (let i = 0; i < links.length; ++i) {
let link = links[i];
let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
@@ -132,9 +130,7 @@ export default class StatusContent extends React.PureComponent {
);
const content = { __html: status.get('contentHtml') };
const spoilerContent = {
__html: status.get('spoilerHtml'),
};
const spoilerContent = { __html: status.get('spoilerHtml') };
const directionStyle = { direction: 'ltr' };
const classNames = classnames('status__content', {
'status__content--with-action': parseClick && !disabled,

8
app/javascript/glitch/components/status/prepend.js
View File

@@ -22,12 +22,8 @@ Imports:
import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import escapeTextContentForBrowser from 'escape-html';
import { FormattedMessage } from 'react-intl';
// Mastodon imports //
import emojify from '../../../mastodon/emoji';
/* * * * */
/*
@@ -99,9 +95,7 @@ generate the message.
>
<b
dangerouslySetInnerHTML={{
__html : emojify(escapeTextContentForBrowser(
account.get('display_name') || account.get('username')
)),
__html : account.get('display_name_html') || account.get('username'),
}}
/>
</a>