fix two room list regressions #4907
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
+ missing roomsublist badge for invites + missing room badge for invites if i18n!=English Signed-off-by: Michael Telatynski <[email protected]>
lukebarnard1
suggested changes
Aug 29, 2017
| @@ -78,6 +78,9 @@ var RoomSubList = React.createClass({ | |||
| // undefined if no room is selected (eg we are showing settings) | |||
| selectedRoom: React.PropTypes.string, | |||
|
|
|||
| // pass explicitly, do not rely on label==='Invites' because i18n. | |||
There was a problem hiding this comment.
Out of context, this comment doesn't mean much. Maybe just mention that it's passed through to RoomTile and makes the header highlighted regardless of notifications.
| @@ -409,6 +412,9 @@ var RoomSubList = React.createClass({ | |||
| var badge; | |||
| if (subListNotifCount > 0) { | |||
| badge = <div className={badgeClasses}>{ FormattingUtils.formatCount(subListNotifCount) }</div>; | |||
| } else if (this.props.isInvite) { | |||
| // no notifications but highlight anyway because this is an invite badge | |||
| badge = <div className={badgeClasses}>!</div>; | |||
There was a problem hiding this comment.
Perhaps show the number of invites, i.e. the number of items in the sublist. I'd suggest just using the if, passing a generic count to .formatCount above, and then deciding whether to set count to subListNotifCount or roomCount based on isInvite.
There was a problem hiding this comment.
Never mind, the "!" is by design and the number of invites is already displayed in the sublist header.
There was a problem hiding this comment.
#3707 (comment) for history sake
Signed-off-by: Michael Telatynski <[email protected]>
t3chguy
force-pushed
the
t3chguy/fix_two_roomlist_regressions
branch
from
49dee4d to
f560dc4
Compare
lukebarnard1
approved these changes
Aug 29, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requires matrix-org/matrix-react-sdk#1343
Signed-off-by: Michael Telatynski [email protected]