nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Fixes #14511
This commit is contained in:
ThibG 2020-08-05 22:39:14 +02:00 committed by GitHub
parent 63bbe6cab8
commit a637344e37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,22 +5,30 @@ 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 HASHTAG_SEPARATORS = "_\\u00b7\\u200c"; const buildHashtagRE = () => {
const ALPHA = '\\p{L}\\p{M}'; try {
const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}'; const HASHTAG_SEPARATORS = "_\\u00b7\\u200c";
const APPROX_HASHTAG_RE = new RegExp( const ALPHA = '\\p{L}\\p{M}';
'(?:^|[^\\/\\)\\w])#((' + const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}';
'[' + WORD + '_]' + return new RegExp(
'[' + WORD + HASHTAG_SEPARATORS + ']*' + '(?:^|[^\\/\\)\\w])#((' +
'[' + ALPHA + HASHTAG_SEPARATORS + ']' + '[' + WORD + '_]' +
'[' + WORD + HASHTAG_SEPARATORS +']*' + '[' + WORD + HASHTAG_SEPARATORS + ']*' +
'[' + WORD + '_]' + '[' + ALPHA + HASHTAG_SEPARATORS + ']' +
')|(' + '[' + WORD + HASHTAG_SEPARATORS +']*' +
'[' + WORD + '_]*' + '[' + WORD + '_]' +
'[' + ALPHA + ']' + ')|(' +
'[' + WORD + '_]*' + '[' + WORD + '_]*' +
'))', 'iu' '[' + ALPHA + ']' +
); '[' + WORD + '_]*' +
'))', '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']),