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

Run eslint --fix

Browse source 
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
This commit is contained in:
Luke Barnard 2017-10-11 17:56:17 +01:00
parent 8958be9321
commit d3f9a3aeb5
136 changed files with 2540 additions and 2657 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/components/views/settings/AddPhoneNumber.js
View file

@ -81,7 +81,7 @@ export default withMatrixClient(React.createClass({
this._promptForMsisdnVerificationCode(resp.msisdn);
}).catch((err) => {
console.error("Unable to add phone number: " + err);
let msg = err.message;
const msg = err.message;
Modal.createTrackedDialog('Add Phone Number Error', '', ErrorDialog, {
title: _t("Error"),
description: msg,
@ -94,22 +94,22 @@ export default withMatrixClient(React.createClass({
this.setState({msisdn_add_pending: true});
},
_promptForMsisdnVerificationCode:function (msisdn, err) {
_promptForMsisdnVerificationCode: function(msisdn, err) {
if (this._unmounted) return;
const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
let msgElements = [
<div key="_static" >{ _t("A text message has been sent to +%(msisdn)s. Please enter the verification code it contains", { msisdn: msisdn} ) }</div>
const msgElements = [
<div key="_static" >{ _t("A text message has been sent to +%(msisdn)s. Please enter the verification code it contains", { msisdn: msisdn} ) }</div>,
];
if (err) {
let msg = err.error;
if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
msg = _t("Incorrect verification code");
}
msgElements.push(<div key="_error" className="error">{msg}</div>);
msgElements.push(<div key="_error" className="error">{ msg }</div>);
}
Modal.createTrackedDialog('Prompt for MSISDN Verification Code', '', TextInputDialog, {
title: _t("Enter Code"),
description: <div>{msgElements}</div>,
description: <div>{ msgElements }</div>,
button: _t("Submit"),
onFinished: (should_verify, token) => {
if (!should_verify) {
@ -128,7 +128,7 @@ export default withMatrixClient(React.createClass({
if (this._unmounted) return;
this.setState({msisdn_add_pending: false});
}).done();
}
},
});
},
@ -146,7 +146,7 @@ export default withMatrixClient(React.createClass({
return (
<form className="mx_UserSettings_profileTableRow" onSubmit={this._onAddMsisdnSubmit}>
<div className="mx_UserSettings_profileLabelCell">
<label>{_t('Phone')}</label>
<label>{ _t('Phone') }</label>
</div>
<div className="mx_UserSettings_profileInputCell">
<div className="mx_UserSettings_phoneSection">
@ -158,7 +158,7 @@ export default withMatrixClient(React.createClass({
<input type="text"
ref={this._collectAddMsisdnInput}
className="mx_UserSettings_phoneNumberField"
placeholder={ _t('Add phone number') }
placeholder={_t('Add phone number')}
value={this.state.phoneNumber}
onChange={this._onPhoneNumberChange}
/>
@ -169,5 +169,5 @@ export default withMatrixClient(React.createClass({
</div>
</form>
);
}
}))
},
}));

50
src/components/views/settings/ChangeAvatar.js
View file

@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
var React = require('react');
var MatrixClientPeg = require("../../../MatrixClientPeg");
var sdk = require('../../../index');
const React = require('react');
const MatrixClientPeg = require("../../../MatrixClientPeg");
const sdk = require('../../../index');
import { _t } from '../../../languageHandler';
module.exports = React.createClass({
@ -28,7 +28,7 @@ module.exports = React.createClass({
showUploadSection: React.PropTypes.bool,
width: React.PropTypes.number,
height: React.PropTypes.number,
className: React.PropTypes.string
className: React.PropTypes.string,
},
Phases: {
@ -59,25 +59,25 @@ module.exports = React.createClass({
return;
}
this.setState({
avatarUrl: newProps.initialAvatarUrl
avatarUrl: newProps.initialAvatarUrl,
});
},
setAvatarFromFile: function(file) {
var newUrl = null;
let newUrl = null;
this.setState({
phase: this.Phases.Uploading
phase: this.Phases.Uploading,
});
var self = this;
var httpPromise = MatrixClientPeg.get().uploadContent(file).then(function(url) {
const self = this;
const httpPromise = MatrixClientPeg.get().uploadContent(file).then(function(url) {
newUrl = url;
if (self.props.room) {
return MatrixClientPeg.get().sendStateEvent(
self.props.room.roomId,
'm.room.avatar',
{url: url},
''
'',
);
} else {
return MatrixClientPeg.get().setAvatarUrl(url);
@ -87,11 +87,11 @@ module.exports = React.createClass({
httpPromise.done(function() {
self.setState({
phase: self.Phases.Display,
avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(newUrl)
avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(newUrl),
});
}, function(error) {
self.setState({
phase: self.Phases.Error
phase: self.Phases.Error,
});
self.onError(error);
});
@ -106,31 +106,31 @@ module.exports = React.createClass({
onError: function(error) {
this.setState({
errorText: _t("Failed to upload profile picture!")
errorText: _t("Failed to upload profile picture!"),
});
},
render: function() {
var avatarImg;
let avatarImg;
// Having just set an avatar we just display that since it will take a little
// time to propagate through to the RoomAvatar.
if (this.props.room && !this.avatarSet) {
var RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
avatarImg = <RoomAvatar room={this.props.room} width={ this.props.width } height={ this.props.height } resizeMethod='crop' />;
const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
avatarImg = <RoomAvatar room={this.props.room} width={this.props.width} height={this.props.height} resizeMethod='crop' />;
} else {
var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
// XXX: FIXME: once we track in the JS what our own displayname is(!) then use it here rather than ?
avatarImg = <BaseAvatar width={this.props.width} height={this.props.height} resizeMethod='crop'
name='?' idName={ MatrixClientPeg.get().getUserIdLocalpart() } url={this.state.avatarUrl} />;
name='?' idName={MatrixClientPeg.get().getUserIdLocalpart()} url={this.state.avatarUrl} />;
}
var uploadSection;
let uploadSection;
if (this.props.showUploadSection) {
uploadSection = (
<div className={this.props.className}>
{_t("Upload new:")}
<input type="file" accept="image/*" onChange={this.onFileSelected}/>
{this.state.errorText}
{ _t("Upload new:") }
<input type="file" accept="image/*" onChange={this.onFileSelected} />
{ this.state.errorText }
</div>
);
}
@ -141,9 +141,9 @@ module.exports = React.createClass({
return (
<div>
<div className={this.props.className}>
{avatarImg}
{ avatarImg }
</div>
{uploadSection}
{ uploadSection }
</div>
);
case this.Phases.Uploading:
@ -152,5 +152,5 @@ module.exports = React.createClass({
<Loader />
);
}
}
},
});

19
src/components/views/settings/ChangeDisplayName.js
View file

@ -15,23 +15,22 @@ limitations under the License.
*/
'use strict';
var React = require('react');
var sdk = require('../../../index');
var MatrixClientPeg = require("../../../MatrixClientPeg");
const React = require('react');
const sdk = require('../../../index');
const MatrixClientPeg = require("../../../MatrixClientPeg");
import { _t } from '../../../languageHandler';
module.exports = React.createClass({
displayName: 'ChangeDisplayName',
_getDisplayName: function() {
var cli = MatrixClientPeg.get();
const cli = MatrixClientPeg.get();
return cli.getProfileInfo(cli.credentials.userId).then(function(result) {
var displayname = result.displayname;
let displayname = result.displayname;
if (!displayname) {
if (MatrixClientPeg.get().isGuest()) {
displayname = "Guest " + MatrixClientPeg.get().getUserIdLocalpart();
}
else {
} else {
displayname = MatrixClientPeg.get().getUserIdLocalpart();
}
}
@ -42,14 +41,14 @@ module.exports = React.createClass({
},
_changeDisplayName: function(new_displayname) {
var cli = MatrixClientPeg.get();
const cli = MatrixClientPeg.get();
return cli.setDisplayName(new_displayname).catch(function(e) {
throw new Error("Failed to set display name");
});
},
render: function() {
var EditableTextContainer = sdk.getComponent('elements.EditableTextContainer');
const EditableTextContainer = sdk.getComponent('elements.EditableTextContainer');
return (
<EditableTextContainer
getInitialValue={this._getDisplayName}
@ -57,5 +56,5 @@ module.exports = React.createClass({
blurToSubmit={true}
onSubmit={this._changeDisplayName} />
);
}
},
});

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

@ -16,10 +16,10 @@ limitations under the License.
'use strict';
var React = require('react');
var MatrixClientPeg = require("../../../MatrixClientPeg");
var Modal = require("../../../Modal");
var sdk = require("../../../index");
const React = require('react');
const MatrixClientPeg = require("../../../MatrixClientPeg");
const Modal = require("../../../Modal");
const sdk = require("../../../index");
import Promise from 'bluebird';
import AccessibleButton from '../elements/AccessibleButton';
@ -45,7 +45,7 @@ module.exports = React.createClass({
Phases: {
Edit: "edit",
Uploading: "uploading",
Error: "error"
Error: "error",
},
getDefaultProps: function() {
@ -55,11 +55,11 @@ module.exports = React.createClass({
onCheckPassword: function(oldPass, newPass, confirmPass) {
if (newPass !== confirmPass) {
return {
error: _t("New passwords don't match")
error: _t("New passwords don't match"),
};
} else if (!newPass || newPass.length === 0) {
return {
error: _t("Passwords can't be empty")
error: _t("Passwords can't be empty"),
};
}
},
@ -112,7 +112,7 @@ module.exports = React.createClass({
'Changing password will currently reset any end-to-end encryption keys on all devices, ' +
'making encrypted chat history unreadable, unless you first export your room keys ' +
'and re-import them afterwards. ' +
'In future this will be improved.'
'In future this will be improved.',
) } (<a href="https://github.com/vector-im/riot-web/issues/2671">https://github.com/vector-im/riot-web/issues/2671</a>)
</div>,
button: _t("Continue"),
@ -120,7 +120,7 @@ module.exports = React.createClass({
<button className="mx_Dialog_primary"
onClick={this._onExportE2eKeysClicked}>
{ _t('Export E2E room keys') }
</button>
</button>,
],
onFinished: (confirmed) => {
if (confirmed) {
@ -254,5 +254,5 @@ module.exports = React.createClass({
</div>
);
}
}
},
});

20
src/components/views/settings/DevicesPanel.js
View file

@ -52,7 +52,7 @@ export default class DevicesPanel extends React.Component {
},
(error) => {
if (this._unmounted) { return; }
var errtxt;
let errtxt;
if (error.httpStatus == 404) {
// 404 probably means the HS doesn't yet support the API.
errtxt = _t("Your home server does not support device management.");
@ -61,7 +61,7 @@ export default class DevicesPanel extends React.Component {
errtxt = _t("Unable to load device list");
}
this.setState({deviceLoadError: errtxt});
}
},
);
}
@ -89,14 +89,14 @@ export default class DevicesPanel extends React.Component {
const removed_id = device.device_id;
this.setState((state, props) => {
const newDevices = state.devices.filter(
d => { return d.device_id != removed_id; }
(d) => { return d.device_id != removed_id; },
);
return { devices: newDevices };
});
}
_renderDevice(device) {
var DevicesPanelEntry = sdk.getComponent('settings.DevicesPanelEntry');
const DevicesPanelEntry = sdk.getComponent('settings.DevicesPanelEntry');
return (
<DevicesPanelEntry key={device.device_id} device={device}
onDeleted={()=>{this._onDeviceDeleted(device);}} />
@ -110,7 +110,7 @@ export default class DevicesPanel extends React.Component {
const classes = classNames(this.props.className, "error");
return (
<div className={classes}>
{this.state.deviceLoadError}
{ this.state.deviceLoadError }
</div>
);
}
@ -119,7 +119,7 @@ export default class DevicesPanel extends React.Component {
if (devices === undefined) {
// still loading
const classes = this.props.className;
return <Spinner className={classes}/>;
return <Spinner className={classes} />;
}
devices.sort(this._deviceCompare);
@ -128,12 +128,12 @@ export default class DevicesPanel extends React.Component {
return (
<div className={classes}>
<div className="mx_DevicesPanel_header">
<div className="mx_DevicesPanel_deviceId">{_t("Device ID")}</div>
<div className="mx_DevicesPanel_deviceName">{_t("Device Name")}</div>
<div className="mx_DevicesPanel_deviceLastSeen">{_t("Last seen")}</div>
<div className="mx_DevicesPanel_deviceId">{ _t("Device ID") }</div>
<div className="mx_DevicesPanel_deviceName">{ _t("Device Name") }</div>
<div className="mx_DevicesPanel_deviceLastSeen">{ _t("Last seen") }</div>
<div className="mx_DevicesPanel_deviceButtons"></div>
</div>
{devices.map(this._renderDevice)}
{ devices.map(this._renderDevice) }
</div>
);
}

16
src/components/views/settings/DevicesPanelEntry.js
View file

@ -69,7 +69,7 @@ export default class DevicesPanelEntry extends React.Component {
}
// pop up an interactive auth dialog
var InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
Modal.createTrackedDialog('Delete Device Dialog', '', InteractiveAuthDialog, {
title: _t("Authentication"),
@ -101,7 +101,7 @@ export default class DevicesPanelEntry extends React.Component {
this.props.onDeleted();
if (this._unmounted) { return; }
this.setState({ deleting: false });
}
},
);
}
@ -129,7 +129,7 @@ export default class DevicesPanelEntry extends React.Component {
let deleteButton;
if (this.state.deleteError) {
deleteButton = <div className="error">{this.state.deleteError}</div>;
deleteButton = <div className="error">{ this.state.deleteError }</div>;
} else {
deleteButton = (
<div className="mx_textButton"
@ -139,15 +139,15 @@ export default class DevicesPanelEntry extends React.Component {
);
}
var myDeviceClass = '';
let myDeviceClass = '';
if (device.device_id === MatrixClientPeg.get().getDeviceId()) {
myDeviceClass = " mx_DevicesPanel_myDevice";
}
return (
<div className={ "mx_DevicesPanel_device" + myDeviceClass }>
<div className={"mx_DevicesPanel_device" + myDeviceClass}>
<div className="mx_DevicesPanel_deviceId">
{device.device_id}
{ device.device_id }
</div>
<div className="mx_DevicesPanel_deviceName">
<EditableTextContainer initialValue={device.display_name}
@ -156,10 +156,10 @@ export default class DevicesPanelEntry extends React.Component {
/>
</div>
<div className="mx_DevicesPanel_lastSeen">
{lastSeen}
{ lastSeen }
</div>
<div className="mx_DevicesPanel_deviceButtons">
{deleteButton}
{ deleteButton }
</div>
</div>
);

14
src/components/views/settings/EnableNotificationsButton.js
View file

@ -15,9 +15,9 @@ limitations under the License.
*/
'use strict';
var React = require("react");
var Notifier = require("../../../Notifier");
var dis = require("../../../dispatcher");
const React = require("react");
const Notifier = require("../../../Notifier");
const dis = require("../../../dispatcher");
import { _t } from '../../../languageHandler';
module.exports = React.createClass({
@ -43,7 +43,7 @@ module.exports = React.createClass({
},
onClick: function() {
var self = this;
const self = this;
if (!Notifier.supportsDesktopNotifications()) {
return;
}
@ -61,15 +61,15 @@ module.exports = React.createClass({
if (this.enabled()) {
return (
<button className="mx_EnableNotificationsButton" onClick={this.onClick}>
{_t("Disable Notifications")}
{ _t("Disable Notifications") }
</button>
);
} else {
return (
<button className="mx_EnableNotificationsButton" onClick={this.onClick}>
{_t("Enable Notifications")}
{ _t("Enable Notifications") }
</button>
);
}
}
},
});