matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Fix class construction in MemberList

Browse Source
This commit is contained in:
Travis Ralston
2020-01-07 15:55:02 -07:00
parent 727ce892de
commit 19f78d4d97
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/rooms/MemberList.js
View File

@@ -32,15 +32,11 @@ const INITIAL_LOAD_NUM_MEMBERS = 30;
const INITIAL_LOAD_NUM_INVITED = 5; const INITIAL_LOAD_NUM_INVITED = 5;
const SHOW_MORE_INCREMENT = 100; const SHOW_MORE_INCREMENT = 100;
<<<<<<< HEAD
export default createReactClass({
=======
// Regex applied to filter our punctuation in member names before applying sort, to fuzzy it a little // Regex applied to filter our punctuation in member names before applying sort, to fuzzy it a little
// matches all ASCII punctuation: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~ // matches all ASCII punctuation: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
const SORT_REGEX = /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/g; const SORT_REGEX = /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/g;
module.exports = createReactClass({ export default createReactClass({
>>>>>>> develop
displayName: 'MemberList', displayName: 'MemberList',
getInitialState: function() { getInitialState: function() {