mirror of https://github.com/Siphonay/mastodon
[Glitch] Fallback to previous, more approximative hashtag RE on older browsers
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
parent
13501f7393
commit
a3806ec6ba
|
@ -6,10 +6,12 @@ import { FormattedMessage } from 'react-intl';
|
|||
import { me } from 'flavours/glitch/util/initial_state';
|
||||
import { profileLink, termsLink } from 'flavours/glitch/util/backend_links';
|
||||
|
||||
const buildHashtagRE = () => {
|
||||
try {
|
||||
const HASHTAG_SEPARATORS = "_\\u00b7\\u200c";
|
||||
const ALPHA = '\\p{L}\\p{M}';
|
||||
const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}';
|
||||
const APPROX_HASHTAG_RE = new RegExp(
|
||||
return new RegExp(
|
||||
'(?:^|[^\\/\\)\\w])#((' +
|
||||
'[' + WORD + '_]' +
|
||||
'[' + WORD + HASHTAG_SEPARATORS + ']*' +
|
||||
|
@ -22,6 +24,12 @@ const APPROX_HASHTAG_RE = new RegExp(
|
|||
'[' + WORD + '_]*' +
|
||||
'))', 'iu'
|
||||
);
|
||||
} catch {
|
||||
return /(?:^|[^\/\)\w])#(\w*[a-zA-Z·]\w*)/i;
|
||||
}
|
||||
};
|
||||
|
||||
const APPROX_HASHTAG_RE = buildHashtagRE();
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
|
||||
|
|
Loading…
Reference in New Issue