From 03c491416e724c30a099635b19c2cfc3cdb7ecaf Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 12 Feb 2019 11:41:24 +0100
Subject: [PATCH] put breadcrumbs behind feature flag
---
src/components/structures/LeftPanel.js | 7 ++++++-
src/i18n/strings/en_EN.json | 1 +
src/settings/Settings.js | 6 ++++++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 55b8c34ae6..000195d349 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -216,12 +216,17 @@ const LeftPanel = React.createClass({
onCleared={ this.onSearchCleared }
collapsed={this.props.collapsed} />);
+ let breadcrumbs;
+ if (SettingsStore.isFeatureEnabled("feature_room_breadcrumbs")) {
+ breadcrumbs = (<RoomBreadcrumbs collapsed={this.props.collapsed} />);
+ }
+
return (
<div className={containerClasses}>
{ tagPanelContainer }
<aside className={"mx_LeftPanel dark-panel"} onKeyDown={ this._onKeyDown } onFocus={ this._onFocus } onBlur={ this._onBlur }>
<TopLeftMenuButton collapsed={ this.props.collapsed } />
- <RoomBreadcrumbs collapsed={this.props.collapsed} />
+ { breadcrumbs }
{ searchBox }
<CallPreview ConferenceHandler={VectorConferenceHandler} />
<RoomList
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3cc6e71436..6994d5d70b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -270,6 +270,7 @@
"Failed to join room": "Failed to join room",
"Message Pinning": "Message Pinning",
"Custom user status messages": "Custom user status messages",
+ "Show recent room avatars above the room list": "Show recent room avatars above the room list",
"Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
"Render simple counters in room header": "Render simple counters in room header",
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 9dfbc7d51e..7897342d72 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -99,6 +99,12 @@ export const SETTINGS = {
default: false,
controller: new CustomStatusController(),
},
+ "feature_room_breadcrumbs": {
+ isFeature: true,
+ displayName: _td("Show recent room avatars above the room list"),
+ supportedLevels: LEVELS_FEATURE,
+ default: false,
+ },
"feature_custom_tags": {
isFeature: true,
displayName: _td("Group & filter rooms by custom tags (refresh to apply changes)"),