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

Merge pull request #6269 from vector-im/luke/feature-disable-tag-panel 

Add setting to disable TagPanel
pull/6273/head
David Baker 2018-03-01 15:05:13 +00:00 committed by GitHub
parent 56ca1bc7ee d23c02b196
commit e1e8d9777b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/BottomLeftMenu.js
View File

@ -168,6 +168,10 @@ module.exports = React.createClass({
const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton'); const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton'); const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
const SettingsButton = sdk.getComponent('elements.SettingsButton'); const SettingsButton = sdk.getComponent('elements.SettingsButton');
const GroupsButton = sdk.getComponent('elements.GroupsButton');
const groupsButton = SettingsStore.getValue("TagPanel.disableTagPanel") ?
<GroupsButton tooltip={true} /> : null;
return ( return (
<div className="mx_BottomLeftMenu"> <div className="mx_BottomLeftMenu">
@ -182,6 +186,7 @@ module.exports = React.createClass({
<div ref={this._collectCreateRoomButton}> <div ref={this._collectCreateRoomButton}>
<CreateRoomButton tooltip={true} /> <CreateRoomButton tooltip={true} />
</div> </div>
{ groupsButton }
<span className="mx_BottomLeftMenu_settings"> <span className="mx_BottomLeftMenu_settings">
<SettingsButton tooltip={true} /> <SettingsButton tooltip={true} />
</span> </span>

4
src/components/structures/LeftPanel.js
View File

@ -194,7 +194,9 @@ var LeftPanel = React.createClass({
} }
); );
const tagPanelEnabled = SettingsStore.isFeatureEnabled("feature_tag_panel"); const tagPanelEnabled =
SettingsStore.isFeatureEnabled("feature_tag_panel") &&
!SettingsStore.getValue("TagPanel.disableTagPanel");
const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />; const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;
const containerClasses = classNames( const containerClasses = classNames(

2
src/i18n/strings/en_EN.json
View File

@ -133,7 +133,6 @@
"Online": "Online", "Online": "Online",
"Away": "Away", "Away": "Away",
"Appear Offline": "Appear Offline", "Appear Offline": "Appear Offline",
"Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
"Failed to set Direct Message status of room": "Failed to set Direct Message status of room", "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
"unknown error code": "unknown error code", "unknown error code": "unknown error code",
"Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s", "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
@ -190,7 +189,6 @@
"Search for a room": "Search for a room", "Search for a room": "Search for a room",
"#example": "#example", "#example": "#example",
"more": "more", "more": "more",
"Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
"Expand panel": "Expand panel", "Expand panel": "Expand panel",
"Collapse panel": "Collapse panel", "Collapse panel": "Collapse panel",
"Filter room names": "Filter room names", "Filter room names": "Filter room names",