PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Rename SettingsCheckbox to be a bit more generic

Browse source 
Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox.

Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-10-30 20:08:27 -06:00
parent 3efb0fdeeb
commit f070604350
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/structures/UserSettings.js
View file

@ -664,10 +664,10 @@ module.exports = React.createClass({
}, },
_renderSyncedSetting: function(setting) { _renderSyncedSetting: function(setting) {
const SettingsCheckbox = sdk.getComponent("elements.SettingsCheckbox"); const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
return ( return (
<div className="mx_UserSettings_toggle" key={setting.id}> <div className="mx_UserSettings_toggle" key={setting.id}>
<SettingsCheckbox name={setting.id} <SettingsFlag name={setting.id}
label={setting.label} label={setting.label}
level="account" level="account"
onChange={setting.fn} /> onChange={setting.fn} />
@ -676,11 +676,11 @@ module.exports = React.createClass({
}, },
_renderThemeSelector: function(setting) { _renderThemeSelector: function(setting) {
const SettingsCheckbox = sdk.getComponent("elements.SettingsCheckbox"); const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
const onChange = (v) => dis.dispatch({action: 'set_theme', value: setting.value}); const onChange = (v) => dis.dispatch({action: 'set_theme', value: setting.value});
return ( return (
<div className="mx_UserSettings_toggle" key={setting.id + '_' + setting.value}> <div className="mx_UserSettings_toggle" key={setting.id + '_' + setting.value}>
<SettingsCheckbox name="theme" <SettingsFlag name="theme"
label={setting.label} label={setting.label}
level="account" level="account"
onChange={onChange} onChange={onChange}
@ -756,10 +756,10 @@ module.exports = React.createClass({
}, },
_renderLocalSetting: function(setting) { _renderLocalSetting: function(setting) {
const SettingsCheckbox = sdk.getComponent("elements.SettingsCheckbox"); const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
return ( return (
<div className="mx_UserSettings_toggle" key={setting.id}> <div className="mx_UserSettings_toggle" key={setting.id}>
<SettingsCheckbox name={setting.id} <SettingsFlag name={setting.id}
label={setting.label} label={setting.label}
level="device" level="device"
onChange={setting.fn} /> onChange={setting.fn} />

2
src/components/views/elements/SettingsCheckbox.js → src/components/views/elements/SettingsFlag.js
View file

@ -19,7 +19,7 @@ import SettingsStore from "../../../settings/SettingsStore";
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'SettingsCheckbox', displayName: 'SettingsFlag',
propTypes: { propTypes: {
name: React.PropTypes.string.isRequired, name: React.PropTypes.string.isRequired,
level: React.PropTypes.string.isRequired, level: React.PropTypes.string.isRequired,

6
src/components/views/room_settings/UrlPreviewSettings.js
View file

@ -34,7 +34,7 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
const SettingsCheckbox = sdk.getComponent("elements.SettingsCheckbox"); const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
const roomId = this.props.room.roomId; const roomId = this.props.room.roomId;
let previewsForAccount = null; let previewsForAccount = null;
@ -53,7 +53,7 @@ module.exports = React.createClass({
if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) { if (SettingsStore.canSetValue("urlPreviewsEnabled", roomId, "room")) {
previewsForRoom = ( previewsForRoom = (
<label> <label>
<SettingsCheckbox name="urlPreviewsEnabled" <SettingsFlag name="urlPreviewsEnabled"
level="room" level="room"
roomId={this.props.room.roomId} roomId={this.props.room.roomId}
isExplicit={true} /> isExplicit={true} />
@ -68,7 +68,7 @@ module.exports = React.createClass({
} }
let previewsForRoomAccount = ( let previewsForRoomAccount = (
<SettingsCheckbox name="urlPreviewsEnabled" <SettingsFlag name="urlPreviewsEnabled"
level="room-account" level="room-account"
roomId={this.props.room.roomId} roomId={this.props.room.roomId}
/> />