OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1623 from turt2live/travis/presence-break 

Disable presence controls if there's no presence
pull/21833/head
Richard van der Hoff 2017-11-21 17:40:31 +00:00 committed by GitHub
parent 4e7fd55fb4 5f3fda2950
commit 91dbe956c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/avatars/MemberPresenceAvatar.js
View File

@ -25,6 +25,7 @@ import dispatcher from "../../../dispatcher";
import * as ContextualMenu from "../../structures/ContextualMenu"; import * as ContextualMenu from "../../structures/ContextualMenu";
import SettingsStore from "../../../settings/SettingsStore"; import SettingsStore from "../../../settings/SettingsStore";
// This is an avatar with presence information and controls on it.
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MemberPresenceAvatar', displayName: 'MemberPresenceAvatar',
@ -142,7 +143,8 @@ module.exports = React.createClass({
); );
// LABS: Disable presence management functions for now // LABS: Disable presence management functions for now
if (!SettingsStore.isFeatureEnabled("feature_presence_management")) { // Also disable the presence information if there's no status information
if (!SettingsStore.isFeatureEnabled("feature_presence_management") || !this.state.status) {
statusNode = null; statusNode = null;
onClickFn = null; onClickFn = null;
} }