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

Merge pull request #2559 from matrix-org/travis/settings/disable-old 

Disable old settings, making tabbed settings the default
pull/21833/head
Travis Ralston 2019-02-01 11:18:43 -07:00 committed by GitHub
parent 62f59f8cef 2a9149668c
commit 37fe22409f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/MatrixChat.js
View File

@ -572,7 +572,7 @@ export default React.createClass({
this._viewIndexedRoom(payload.roomIndex); this._viewIndexedRoom(payload.roomIndex);
break; break;
case 'view_user_settings': { case 'view_user_settings': {
if (SettingsStore.isFeatureEnabled("feature_tabbed_settings")) { if (true || SettingsStore.isFeatureEnabled("feature_tabbed_settings")) {
const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog"); const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
Modal.createTrackedDialog('User settings', '', UserSettingsDialog, {}, 'mx_SettingsDialog'); Modal.createTrackedDialog('User settings', '', UserSettingsDialog, {}, 'mx_SettingsDialog');
} else { } else {

10
src/components/views/dialogs/RoomSettingsDialog.js
View File

@ -83,11 +83,11 @@ export default class RoomSettingsDialog extends React.Component {
"mx_RoomSettingsDialog_warningIcon", "mx_RoomSettingsDialog_warningIcon",
<AdvancedRoomSettingsTab roomId={this.props.roomId} />, <AdvancedRoomSettingsTab roomId={this.props.roomId} />,
)); ));
tabs.push(new Tab( // tabs.push(new Tab(
_td("Visit old settings"), // _td("Visit old settings"),
"mx_RoomSettingsDialog_warningIcon", // "mx_RoomSettingsDialog_warningIcon",
<TempTab onClose={this.props.onFinished} />, // <TempTab onClose={this.props.onFinished} />,
)); // ));
return tabs; return tabs;
} }

10
src/components/views/dialogs/UserSettingsDialog.js
View File

@ -96,11 +96,11 @@ export default class UserSettingsDialog extends React.Component {
"mx_UserSettingsDialog_helpIcon", "mx_UserSettingsDialog_helpIcon",
<HelpSettingsTab closeSettingsFn={this.props.onFinished} />, <HelpSettingsTab closeSettingsFn={this.props.onFinished} />,
)); ));
tabs.push(new Tab( // tabs.push(new Tab(
_td("Visit old settings"), // _td("Visit old settings"),
"mx_UserSettingsDialog_helpIcon", // "mx_UserSettingsDialog_helpIcon",
<TempTab onClose={this.props.onFinished} />, // <TempTab onClose={this.props.onFinished} />,
)); // ));
return tabs; return tabs;
} }

2
src/stores/RoomViewStore.js
View File

@ -120,7 +120,7 @@ class RoomViewStore extends Store {
}); });
break; break;
case 'open_room_settings': case 'open_room_settings':
if (SettingsStore.isFeatureEnabled("feature_tabbed_settings")) { if (true || SettingsStore.isFeatureEnabled("feature_tabbed_settings")) {
const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog"); const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, { Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
roomId: this._state.roomId, roomId: this._state.roomId,