Merge pull request #3678 from matrix-org/dbkr/remove_dead_velocity_ui

Remove broken velocity-ui animation
pull/21833/head
David Baker 2019-12-03 10:38:40 +00:00 committed by GitHub
commit 910c50370b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions

View File

@ -1,5 +1,6 @@
/* /*
Copyright 2016 OpenMarket Ltd Copyright 2016 OpenMarket Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -21,15 +22,12 @@ import sdk from '../../../index';
import Analytics from '../../../Analytics'; import Analytics from '../../../Analytics';
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
import * as Lifecycle from '../../../Lifecycle'; import * as Lifecycle from '../../../Lifecycle';
import Velocity from 'velocity-animate';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
export default class DeactivateAccountDialog extends React.Component { export default class DeactivateAccountDialog extends React.Component {
constructor(props, context) { constructor(props, context) {
super(props, context); super(props, context);
this._passwordField = null;
this._onOk = this._onOk.bind(this); this._onOk = this._onOk.bind(this);
this._onCancel = this._onCancel.bind(this); this._onCancel = this._onCancel.bind(this);
this._onPasswordFieldChange = this._onPasswordFieldChange.bind(this); this._onPasswordFieldChange = this._onPasswordFieldChange.bind(this);
@ -78,7 +76,6 @@ export default class DeactivateAccountDialog extends React.Component {
// https://matrix.org/jira/browse/SYN-744 // https://matrix.org/jira/browse/SYN-744
if (err.httpStatus === 401 || err.httpStatus === 403) { if (err.httpStatus === 401 || err.httpStatus === 403) {
errStr = _t('Incorrect password'); errStr = _t('Incorrect password');
Velocity(this._passwordField, "callout.shake", 300);
} }
this.setState({ this.setState({
busy: false, busy: false,
@ -181,7 +178,6 @@ export default class DeactivateAccountDialog extends React.Component {
label={_t('Password')} label={_t('Password')}
onChange={this._onPasswordFieldChange} onChange={this._onPasswordFieldChange}
value={this.state.password} value={this.state.password}
ref={(e) => {this._passwordField = e;}}
className={passwordBoxClass} className={passwordBoxClass}
/> />
</div> </div>