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

Disable old settings, making tabbed settings the default 

This is intentionally not removing the labs flag or other supporting structures of the old settings to make a revert as easy as possible in the event that needs to happen. All of the cruft left behind (TempTab, temp styles, labs flag, old components, etc) will be removed in the very near future.
pull/21833/head
Travis Ralston 2019-02-01 10:29:13 -07:00
parent dca194f5e1
commit 728748c9cd
4 changed files with 13 additions and 13 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 {

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

@ -81,13 +81,13 @@ export default class RoomSettingsDialog extends React.Component {
tabs.push(new Tab( tabs.push(new Tab(
_td("Advanced"), _td("Advanced"),
"mx_RoomSettingsDialog_warningIcon", "mx_RoomSettingsDialog_warningIcon",
<AdvancedRoomSettingsTab roomId={this.props.roomId} />, <AdvancedRoomSettingsTab roomId={thisfea.props.roomId} />,
));
tabs.push(new Tab(
_td("Visit old settings"),
"mx_RoomSettingsDialog_warningIcon",
<TempTab onClose={this.props.onFinished} />,
)); ));
// tabs.push(new Tab(
// _td("Visit old settings"),
// "mx_RoomSettingsDialog_warningIcon",
// <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,