Skip to content
Snippets Groups Projects
Commit ec75941c authored by Brian Peiris's avatar Brian Peiris
Browse files

Merge branch 'other/prettier' of github.com:mozilla/mr-social-client into other/delint3

parents ea4a2060 0d9aa64a
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,7 @@ class ProfileEntryPanel extends Component { ...@@ -87,7 +87,7 @@ class ProfileEntryPanel extends Component {
className="profile-entry__avatar-selector" className="profile-entry__avatar-selector"
src={ src={
/* HACK: Have to account for the smoke test server like this. Feels wrong though. */ /* HACK: Have to account for the smoke test server like this. Feels wrong though. */
`${/smoke/i.test(location.hostname) ? "smoke-" : ""}avatar-selector.html#avatar_id=${ `$/{/smoke/i.test(location.hostname) ? "smoke-" : ""}avatar-selector.html#avatar_id=${
this.state.avatar_id this.state.avatar_id
}` }`
} }
...@@ -95,26 +95,6 @@ class ProfileEntryPanel extends Component { ...@@ -95,26 +95,6 @@ class ProfileEntryPanel extends Component {
/> />
<input className="profile-entry__form-submit" type="submit" value={formatMessage({ id: "profile.save" })} /> <input className="profile-entry__form-submit" type="submit" value={formatMessage({ id: "profile.save" })} />
</div> </div>
<input
className="profile-entry__form-field-text"
value={this.state.display_name}
onChange={e => this.setState({ display_name: e.target.value })}
required
pattern={SCHEMA.definitions.profile.properties.display_name.pattern}
title={formatMessage({ id: "profile.display_name.validation_warning" })}
ref={inp => (this.nameInput = inp)}
/>
<iframe
className="profile-entry__avatar-selector"
src={
/* HACK: Have to account for the smoke test server like this. Feels wrong though. */
`/${/smoke/i.test(location.hostname) ? "smoke-" : ""}avatar-selector.html#avatar_id=${
this.state.avatar_id
}`
}
ref={ifr => (this.avatarSelector = ifr)}
/>
<input className="profile-entry__form-submit" type="submit" value={formatMessage({ id: "profile.save" })} />
</form> </form>
</div> </div>
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment