Merge pull request #2249 from Half-Shot/hs/devtools-in-roomsettings
Add a devtools button to roomsettingspull/21833/head
commit
8d47baa95a
|
@ -28,6 +28,13 @@ limitations under the License.
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mx_RoomSettings_devtoolsButton {
|
||||||
|
@mixin mx_DialogButton;
|
||||||
|
position: relative;
|
||||||
|
padding: 4px 1.5em;
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.mx_RoomSettings_upgradeButton,
|
.mx_RoomSettings_upgradeButton,
|
||||||
.mx_RoomSettings_leaveButton:hover,
|
.mx_RoomSettings_leaveButton:hover,
|
||||||
.mx_RoomSettings_unbanButton:hover {
|
.mx_RoomSettings_unbanButton:hover {
|
||||||
|
|
|
@ -82,6 +82,7 @@ const SIMPLE_SETTINGS = [
|
||||||
{ id: "TagPanel.disableTagPanel" },
|
{ id: "TagPanel.disableTagPanel" },
|
||||||
{ id: "enableWidgetScreenshots" },
|
{ id: "enableWidgetScreenshots" },
|
||||||
{ id: "RoomSubList.showEmpty" },
|
{ id: "RoomSubList.showEmpty" },
|
||||||
|
{ id: "showDeveloperTools" },
|
||||||
];
|
];
|
||||||
|
|
||||||
// These settings must be defined in SettingsStore
|
// These settings must be defined in SettingsStore
|
||||||
|
|
|
@ -590,6 +590,11 @@ module.exports = React.createClass({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_openDevtools: function() {
|
||||||
|
const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
|
||||||
|
Modal.createDialog(DevtoolsDialog, {roomId: this.props.room.roomId});
|
||||||
|
},
|
||||||
|
|
||||||
_renderEncryptionSection: function() {
|
_renderEncryptionSection: function() {
|
||||||
const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
|
const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
|
||||||
|
|
||||||
|
@ -942,6 +947,11 @@ module.exports = React.createClass({
|
||||||
</AccessibleButton>;
|
</AccessibleButton>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const devtoolsButton = SettingsStore.getValue("showDeveloperTools") ?
|
||||||
|
(<AccessibleButton className="mx_RoomSettings_devtoolsButton" onClick={this._openDevtools}>
|
||||||
|
{ _t("Open Devtools") }
|
||||||
|
</AccessibleButton>) : null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mx_RoomSettings">
|
<div className="mx_RoomSettings">
|
||||||
|
|
||||||
|
@ -1055,6 +1065,7 @@ module.exports = React.createClass({
|
||||||
{ _t('Internal room ID: ') } <code>{ this.props.room.roomId }</code><br />
|
{ _t('Internal room ID: ') } <code>{ this.props.room.roomId }</code><br />
|
||||||
{ _t('Room version number: ') } <code>{ this.props.room.getVersion() }</code><br />
|
{ _t('Room version number: ') } <code>{ this.props.room.getVersion() }</code><br />
|
||||||
{ roomUpgradeButton }
|
{ roomUpgradeButton }
|
||||||
|
{ devtoolsButton }
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
@ -1268,5 +1268,7 @@
|
||||||
"Import": "Import",
|
"Import": "Import",
|
||||||
"Failed to set direct chat tag": "Failed to set direct chat tag",
|
"Failed to set direct chat tag": "Failed to set direct chat tag",
|
||||||
"Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
|
"Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
|
||||||
"Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
|
"Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
|
||||||
|
"Open Devtools": "Open Devtools",
|
||||||
|
"Show developer tools": "Show developer tools"
|
||||||
}
|
}
|
||||||
|
|
|
@ -290,4 +290,9 @@ export const SETTINGS = {
|
||||||
displayName: _td('Show empty room list headings'),
|
displayName: _td('Show empty room list headings'),
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
|
"showDeveloperTools": {
|
||||||
|
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||||
|
displayName: _td('Show developer tools'),
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue