treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fallback to previous, more approximative hashtag RE on older browsers (#14513) 

Fixes #14511
lolsob-rspec
ThibG 2020-08-05 22:39:14 +02:00 committed by GitHub
parent 1bedaf49a8
commit ed22b53180
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/features/compose/containers/warning_container.js
View File

@ -5,10 +5,12 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { me } from '../../../initial_state'; import { me } from '../../../initial_state';
const buildHashtagRE = () => {
try {
const HASHTAG_SEPARATORS = "_\\u00b7\\u200c"; const HASHTAG_SEPARATORS = "_\\u00b7\\u200c";
const ALPHA = '\\p{L}\\p{M}'; const ALPHA = '\\p{L}\\p{M}';
const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}'; const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}';
const APPROX_HASHTAG_RE = new RegExp( return new RegExp(
'(?:^|[^\\/\\)\\w])#((' + '(?:^|[^\\/\\)\\w])#((' +
'[' + WORD + '_]' + '[' + WORD + '_]' +
'[' + WORD + HASHTAG_SEPARATORS + ']*' + '[' + WORD + HASHTAG_SEPARATORS + ']*' +
@ -21,6 +23,12 @@ const APPROX_HASHTAG_RE = new RegExp(
'[' + WORD + '_]*' + '[' + WORD + '_]*' +
'))', 'iu' '))', 'iu'
); );
} catch {
return /(?:^|[^\/\)\w])#(\w*[a-zA-Z·]\w*)/i;
}
};
const APPROX_HASHTAG_RE = buildHashtagRE();
const mapStateToProps = state => ({ const mapStateToProps = state => ({
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']), needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),