From d185f3ddafc941e280de7efc6d448449ab5ce2c9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 7 May 2018 09:30:38 +0200
Subject: [PATCH] Use plaintext value for field value tooltips in web UI
(#7388)
Fix #7383
---
app/javascript/mastodon/actions/importer/normalizer.js | 2 ++
app/javascript/mastodon/actions/notifications.js | 8 +-------
.../mastodon/features/account/components/header.js | 2 +-
app/javascript/mastodon/utils/html.js | 6 ++++++
4 files changed, 10 insertions(+), 8 deletions(-)
create mode 100644 app/javascript/mastodon/utils/html.js
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 057bff58bd..c015d3a994 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -1,5 +1,6 @@
import escapeTextContentForBrowser from 'escape-html';
import emojify from '../../features/emoji/emoji';
+import { unescapeHTML } from '../../utils/html';
const domParser = new DOMParser();
@@ -22,6 +23,7 @@ export function normalizeAccount(account) {
...pair,
name_emojified: emojify(escapeTextContentForBrowser(pair.name)),
value_emojified: emojify(pair.value, emojiMap),
+ value_plain: unescapeHTML(pair.value),
}));
}
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 7aa070f569..393268811e 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -8,6 +8,7 @@ import {
importFetchedStatuses,
} from './importer';
import { defineMessages } from 'react-intl';
+import { unescapeHTML } from '../utils/html';
export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
@@ -31,13 +32,6 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
}
};
-const unescapeHTML = (html) => {
- const wrapper = document.createElement('div');
- html = html.replace(/<br \/>|<br>|\n/g, ' ');
- wrapper.innerHTML = html;
- return wrapper.textContent;
-};
-
export function updateNotifications(notification, intlMessages, intlLocale) {
return (dispatch, getState) => {
const showInColumn = getState().getIn(['settings', 'notifications', 'shows', notification.type], true);
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index def6257956..47915e6fb8 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -146,7 +146,7 @@ export default class Header extends ImmutablePureComponent {
{fields.map((pair, i) => (
<dl key={i}>
<dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} />
- <dd dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} title={pair.get('value')} />
+ <dd dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} title={pair.get('value_plain')} />
</dl>
))}
</div>
diff --git a/app/javascript/mastodon/utils/html.js b/app/javascript/mastodon/utils/html.js
new file mode 100644
index 0000000000..0b646ce58f
--- /dev/null
+++ b/app/javascript/mastodon/utils/html.js
@@ -0,0 +1,6 @@
+export const unescapeHTML = (html) => {
+ const wrapper = document.createElement('div');
+ html = html.replace(/<br \/>|<br>|\n/g, ' ');
+ wrapper.innerHTML = html;
+ return wrapper.textContent;
+};
--
GitLab