From 0d9aa64aaf13431873186b099ead46958f17b8bf Mon Sep 17 00:00:00 2001
From: Brian Peiris <brianpeiris@gmail.com>
Date: Mon, 2 Apr 2018 12:15:42 -0700
Subject: [PATCH] fix bad merge
---
src/react-components/profile-entry-panel.js | 22 +--------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/src/react-components/profile-entry-panel.js b/src/react-components/profile-entry-panel.js
index 40973131e..e976b6184 100644
--- a/src/react-components/profile-entry-panel.js
+++ b/src/react-components/profile-entry-panel.js
@@ -86,7 +86,7 @@ class ProfileEntryPanel extends Component {
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=${
+ `$/{/smoke/i.test(location.hostname) ? "smoke-" : ""}avatar-selector.html#avatar_id=${
this.state.avatar_id
}`
}
@@ -94,26 +94,6 @@ class ProfileEntryPanel extends Component {
/>
<input className="profile-entry__form-submit" type="submit" value={formatMessage({ id: "profile.save" })} />
</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>
</div>
);
--
GitLab