From db12bf0f3e931d19a690c05f3e28d18322927397 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 13 Dec 2019 14:56:28 +1100 Subject: [PATCH] ugly hack to empty contenteditable div --- js/views/session_registration_view.js | 4 ++++ ts/components/session/RegistrationTabs.tsx | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/js/views/session_registration_view.js b/js/views/session_registration_view.js index 4bda4d269..834f41f02 100644 --- a/js/views/session_registration_view.js +++ b/js/views/session_registration_view.js @@ -125,4 +125,8 @@ const fx = new TextScramble(el); fx.setText(sessionID); }; + + window.Session.emptyContentEditableDivs = () => { + window.$('div[contenteditable]').html(''); + }; })(); diff --git a/ts/components/session/RegistrationTabs.tsx b/ts/components/session/RegistrationTabs.tsx index bfc26caa4..4858acc16 100644 --- a/ts/components/session/RegistrationTabs.tsx +++ b/ts/components/session/RegistrationTabs.tsx @@ -238,7 +238,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
{window.i18n('yourUniqueSessionID')}
- {this.renderEnterSessionID(false, this.state.hexGeneratedPubKey)} + {this.renderEnterSessionID(false)} {this.renderSignUpButton()} {this.getRenderTermsConditionAgreement()} @@ -429,22 +429,20 @@ export class RegistrationTabs extends React.Component<{}, State> { ); } - private renderEnterSessionID(contentEditable: boolean, text?: string) { + private renderEnterSessionID(contentEditable: boolean) { const enterSessionIDHere = window.i18n('enterSessionIDHere'); return (
{ if (contentEditable) { this.onSecondDeviceSessionIDChanged(e); } }} - > - {text} -
+ /> ); } @@ -532,6 +530,8 @@ export class RegistrationTabs extends React.Component<{}, State> { displayName: '', signUpMode: SignUpMode.Default, }); + //FIXME ugly hack to empty the content editable div used on enter session ID + window.Session.emptyContentEditableDivs(); }} buttonType={buttonType} text={window.i18n('restoreUsingSeed')}