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

[Glitch] Fallback to previous, more approximative hashtag RE on older browsers 

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Thibaut Girka 2020-08-04 21:22:05 +02:00 committed by ThibG
parent 13501f7393
commit a3806ec6ba
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/javascript/flavours/glitch/features/compose/containers/warning_container.js
View File

@ -6,10 +6,12 @@ import { FormattedMessage } from 'react-intl';
import { me } from 'flavours/glitch/util/initial_state'; import { me } from 'flavours/glitch/util/initial_state';
import { profileLink, termsLink } from 'flavours/glitch/util/backend_links'; import { profileLink, termsLink } from 'flavours/glitch/util/backend_links';
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}';
const WORD = '\\p{L}\\p{M}\\p{N}\\p{Pc}';
return new RegExp(
'(?:^|[^\\/\\)\\w])#((' + '(?:^|[^\\/\\)\\w])#((' +
'[' + WORD + '_]' + '[' + WORD + '_]' +
'[' + WORD + HASHTAG_SEPARATORS + ']*' + '[' + WORD + HASHTAG_SEPARATORS + ']*' +
@ -21,7 +23,13 @@ const APPROX_HASHTAG_RE = new RegExp(
'[' + ALPHA + ']' + '[' + ALPHA + ']' +
'[' + 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']),