imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4298 from matrix-org/t3chguy/Bugreportdialog

Browse source 
Field: make id optional, generate one if not provided
This commit is contained in:
Michael Telatynski 2020-03-30 10:30:19 +01:00 • committed by GitHub
commit 057ca35c24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 38 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/settings/ChangePassword.js
View file

@ -235,7 +235,7 @@ export default createReactClass({
if (!this.state.cachedPassword) {
currentPassword = (
<div className={rowClassName}>
<Field id="mx_ChangePassword_oldPassword"
<Field
type="password"
label={_t('Current password')}
value={this.state.oldPassword}
@ -254,7 +254,6 @@ export default createReactClass({
{ currentPassword }
<div className={rowClassName}>
<Field
id="mx_ChangePassword_newPassword"
type="password"
label={passwordLabel}
value={this.state.newPassword}
@ -265,7 +264,6 @@ export default createReactClass({
</div>
<div className={rowClassName}>
<Field
id="mx_ChangePassword_newPasswordConfirm"
type="password"
label={_t("Confirm password")}
value={this.state.newPasswordConfirm}

2
src/components/views/settings/ProfileSettings.js
View file

@ -153,7 +153,7 @@ export default class ProfileSettings extends React.Component {
{this.state.userId}
{hostingSignup}
</p>
<Field id="profileDisplayName" label={_t("Display Name")}
<Field label={_t("Display Name")}
type="text" value={this.state.displayName} autoComplete="off"
onChange={this._onDisplayNameChanged} />
</div>

4
src/components/views/settings/SetIdServer.js
View file

@ -403,8 +403,8 @@ export default class SetIdServer extends React.Component {
<span className="mx_SettingsTab_subsectionText">
{bodyText}
</span>
<Field label={_t("Enter a new identity server")}
id="mx_SetIdServer_idServer"
<Field
label={_t("Enter a new identity server")}
type="text"
autoComplete="off"
placeholder={this.state.defaultIdServer}

2
src/components/views/settings/account/EmailAddresses.js
View file

@ -237,7 +237,7 @@ export default class EmailAddresses extends React.Component {
{existingEmailElements}
<form onSubmit={this._onAddClick} autoComplete="off"
noValidate={true} className="mx_EmailAddresses_new">
<Field id="mx_EmailAddressses_newEmailAddress"
<Field
type="text"
label={_t("Email Address")}
autoComplete="off"

4
src/components/views/settings/account/PhoneNumbers.js
View file

@ -232,7 +232,7 @@ export default class PhoneNumbers extends React.Component {
{this.state.verifyError}
</div>
<form onSubmit={this._onContinueClick} autoComplete="off" noValidate={true}>
<Field id="mx_PhoneNumbers_newPhoneNumberCode"
<Field
type="text"
label={_t("Verification code")}
autoComplete="off"
@ -262,7 +262,7 @@ export default class PhoneNumbers extends React.Component {
{existingPhoneElements}
<form onSubmit={this._onAddClick} autoComplete="off" noValidate={true} className="mx_PhoneNumbers_new">
<div className="mx_PhoneNumbers_input">
<Field id="mx_PhoneNumbers_newPhoneNumber"
<Field
type="text"
label={_t("Phone Number")}
autoComplete="off"

2
src/components/views/settings/discovery/PhoneNumbers.js
View file

@ -208,7 +208,7 @@ export class PhoneNumber extends React.Component {
{this.state.verifyError}
</span>
<form onSubmit={this.onContinueClick} autoComplete="off" noValidate={true}>
<Field id="mx_PhoneNumbers_newPhoneNumberCode"
<Field
type="text"
label={_t("Verification code")}
autoComplete="off"

3
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
View file

@ -422,7 +422,6 @@ export default class GeneralUserSettingsTab extends React.Component {
<Field
label={_t("Custom theme URL")}
type='text'
id='mx_GeneralUserSettingsTab_customThemeInput'
autoComplete="off"
onChange={this._onCustomThemeChange}
value={this.state.customThemeUrl}
@ -448,7 +447,7 @@ export default class GeneralUserSettingsTab extends React.Component {
<div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
<span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
{systemThemeSection}
<Field id="theme" label={_t("Theme")} element="select"
<Field label={_t("Theme")} element="select"
value={this.state.theme} onChange={this._onThemeChange}
disabled={this.state.useSystemTheme}
>

2
src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
View file

@ -272,7 +272,6 @@ export default class MjolnirUserSettingsTab extends React.Component {
<div>
<form onSubmit={this._onAddPersonalRule} autoComplete="off">
<Field
id="mx_MjolnirUserSettingsTab_personalAdd"
type="text"
label={_t("Server or user ID to ignore")}
placeholder={_t("eg: @bot:* or example.org")}
@ -305,7 +304,6 @@ export default class MjolnirUserSettingsTab extends React.Component {
<div>
<form onSubmit={this._onSubscribeList} autoComplete="off">
<Field
id="mx_MjolnirUserSettingsTab_subscriptionAdd"
type="text"
label={_t("Room ID or alias of ban list")}
value={this.state.newList}

3
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View file

@ -195,19 +195,16 @@ export default class PreferencesUserSettingsTab extends React.Component {
{autoHideMenuOption}
{autoLaunchOption}
<Field
id={"autocompleteDelay"}
label={_t('Autocomplete delay (ms)')}
type='number'
value={this.state.autocompleteDelay}
onChange={this._onAutocompleteDelayChange} />
<Field
id={"readMarkerInViewThresholdMs"}
label={_t('Read Marker lifetime (ms)')}
type='number'
value={this.state.readMarkerInViewThresholdMs}
onChange={this._onReadMarkerInViewThresholdMs} />
<Field
id={"readMarkerOutOfViewThresholdMs"}
label={_t('Read Marker off-screen lifetime (ms)')}
type='number'
value={this.state.readMarkerOutOfViewThresholdMs}

6
src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
View file

@ -163,7 +163,7 @@ export default class VoiceUserSettingsTab extends React.Component {
if (audioOutputs.length > 0) {
const defaultDevice = getDefaultDevice(audioOutputs);
speakerDropdown = (
<Field element="select" label={_t("Audio Output")} id="audioOutput"
<Field element="select" label={_t("Audio Output")}
value={this.state.activeAudioOutput || defaultDevice}
onChange={this._setAudioOutput}>
{this._renderDeviceOptions(audioOutputs, 'audioOutput')}
@ -175,7 +175,7 @@ export default class VoiceUserSettingsTab extends React.Component {
if (audioInputs.length > 0) {
const defaultDevice = getDefaultDevice(audioInputs);
microphoneDropdown = (
<Field element="select" label={_t("Microphone")} id="audioInput"
<Field element="select" label={_t("Microphone")}
value={this.state.activeAudioInput || defaultDevice}
onChange={this._setAudioInput}>
{this._renderDeviceOptions(audioInputs, 'audioInput')}
@ -187,7 +187,7 @@ export default class VoiceUserSettingsTab extends React.Component {
if (videoInputs.length > 0) {
const defaultDevice = getDefaultDevice(videoInputs);
webcamDropdown = (
<Field element="select" label={_t("Camera")} id="videoInput"
<Field element="select" label={_t("Camera")}
value={this.state.activeVideoInput || defaultDevice}
onChange={this._setVideoInput}>
{this._renderDeviceOptions(videoInputs, 'videoInput')}