From 7ff84cb07e799ae997b1f8bcc1e1a1bddd178dfb Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Thu, 11 May 2017 09:22:40 +0900 Subject: [PATCH] Refine unescapeHTML (#2977) --- app/javascript/mastodon/actions/notifications.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index 61a245822..1be4ae3a1 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -1,7 +1,6 @@ import api, { getLinks } from '../api' import Immutable from 'immutable'; import IntlMessageFormat from 'intl-messageformat'; -import { unescape } from 'lodash'; import { fetchRelationships } from './accounts'; export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE'; @@ -25,7 +24,11 @@ const fetchRelatedRelationships = (dispatch, notifications) => { } }; -const unescapeHTML = (html) => unescape(html).replace(/<\/?\w+(?:\s[^>]*)?>/g, ''); +const unescapeHTML = (html) => { + const wrapper = document.createElement('div'); + wrapper.innerHTML = html; + return wrapper.textContent; +} export function updateNotifications(notification, intlMessages, intlLocale) { return (dispatch, getState) => {