Merge pull request #3053 from matrix-org/travis/bc-labs

Convert breadcrumbs from labs to real setting
2019-06-03 07:10:51 -06:00
parent 78a0488317 7f0282a2e8
commit ad84144543
4 changed files with 9 additions and 9 deletions
@@ -54,9 +54,9 @@ const LeftPanel = React.createClass({
        this.focusedElement = null;

        this._settingWatchRef = SettingsStore.watchSetting(
-            "feature_room_breadcrumbs", null, this._onBreadcrumbsChanged);
+            "breadcrumbs", null, this._onBreadcrumbsChanged);

-        const useBreadcrumbs = SettingsStore.isFeatureEnabled("feature_room_breadcrumbs");
+        const useBreadcrumbs = !!SettingsStore.getValue("breadcrumbs");
        Analytics.setBreadcrumbs(useBreadcrumbs);
        this.setState({breadcrumbs: useBreadcrumbs});
    },