Fix a bunch of linting errors

eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00 · 2017-01-20 14:22:27 +00:00 · 18d4d3392a
commit 18d4d3392a
parent 4ba224aac3
107 changed files with 290 additions and 290 deletions
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@ -47,7 +47,7 @@ module.exports = {
        return container;
    },

-    createMenu: function (Element, props) {
+    createMenu: function(Element, props) {
        var self = this;

        var closeMenu = function() {
@ -78,15 +78,15 @@ module.exports = {
                .mx_ContextualMenu_chevron_right:after {
                    border-left-color: ${props.menuColour};
                }
-            `
+            `;
        }

        var chevron = null;
        if (props.left) {
-            chevron = <div style={chevronOffset} className="mx_ContextualMenu_chevron_left"></div>
+            chevron = <div style={chevronOffset} className="mx_ContextualMenu_chevron_left"></div>;
            position.left = props.left;
        } else {
-            chevron = <div style={chevronOffset} className="mx_ContextualMenu_chevron_right"></div>
+            chevron = <div style={chevronOffset} className="mx_ContextualMenu_chevron_right"></div>;
            position.right = props.right;
        }

--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@ -118,7 +118,7 @@ module.exports = React.createClass({

        var self = this;

-        deferred.then(function (resp) {
+        deferred.then(function(resp) {
            self.setState({
                phase: self.phases.CREATED,
            });
@ -210,7 +210,7 @@ module.exports = React.createClass({
    onAliasChanged: function(alias) {
        this.setState({
            alias: alias
-        })
+        });
    },

    onEncryptChanged: function(ev) {
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@ -35,7 +35,7 @@ var FilePanel = React.createClass({
    getInitialState: function() {
        return {
            timelineSet: null,
-        }
+        };
    },

    componentWillMount: function() {
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@ -160,8 +160,8 @@ export default React.createClass({
                        collapsedRhs={this.props.collapse_rhs}
                        ConferenceHandler={this.props.ConferenceHandler}
                        scrollStateMap={this._scrollStateMap}
-                    />
-                if (!this.props.collapse_rhs) right_panel = <RightPanel roomId={this.props.currentRoomId} opacity={this.props.sideOpacity} />
+                    />;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel roomId={this.props.currentRoomId} opacity={this.props.sideOpacity} />;
                break;

            case PageTypes.UserSettings:
@ -170,28 +170,28 @@ export default React.createClass({
                    brand={this.props.config.brand}
                    collapsedRhs={this.props.collapse_rhs}
                    enableLabs={this.props.config.enableLabs}
-                />
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
+                />;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
                break;

            case PageTypes.CreateRoom:
                page_element = <CreateRoom
                    onRoomCreated={this.props.onRoomCreated}
                    collapsedRhs={this.props.collapse_rhs}
-                />
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
+                />;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
                break;

            case PageTypes.RoomDirectory:
                page_element = <RoomDirectory
                    collapsedRhs={this.props.collapse_rhs}
                    config={this.props.config.roomDirectory}
-                />
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
+                />;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
                break;
            case PageTypes.UserView:
                page_element = null; // deliberately null for now
-                right_panel = <RightPanel userId={this.props.viewUserId} opacity={this.props.sideOpacity} />
+                right_panel = <RightPanel userId={this.props.viewUserId} opacity={this.props.sideOpacity} />;
                break;
        }

--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@ -77,7 +77,7 @@ module.exports = React.createClass({
    getChildContext: function() {
        return {
            appConfig: this.props.config,
-        }
+        };
    },

    getInitialState: function() {
@ -1038,7 +1038,7 @@ module.exports = React.createClass({
                    {...this.props}
                    {...this.state}
                />
-            )
+            );
        } else if (this.state.logged_in) {
            // we think we are logged in, but are still waiting for the /sync to complete
            var Spinner = sdk.getComponent('elements.Spinner');
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@ -19,7 +19,7 @@ var ReactDOM = require("react-dom");
 var dis = require("../../dispatcher");
 var sdk = require('../../index');

-var MatrixClientPeg = require('../../MatrixClientPeg')
+var MatrixClientPeg = require('../../MatrixClientPeg');

 const MILLIS_IN_DAY = 86400000;

@ -282,7 +282,7 @@ module.exports = React.createClass({
        var isMembershipChange = (e) =>
            e.getType() === 'm.room.member'
            && ['join', 'leave'].indexOf(e.getContent().membership) !== -1
-            && (!e.getPrevContent() || e.getContent().membership  !== e.getPrevContent().membership);
+            && (!e.getPrevContent() || e.getContent().membership !== e.getPrevContent().membership);

        for (i = 0; i < this.props.events.length; i++) {
            var mxEv = this.props.events[i];
@ -340,7 +340,7 @@ module.exports = React.createClass({
                        prevEvent = e;
                        return ret;
                    }
-                ).reduce((a,b) => a.concat(b));
+                ).reduce((a, b) => a.concat(b));

                if (eventTiles.length === 0) {
                    eventTiles = null;
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@ -48,7 +48,7 @@ if (DEBUG) {
    // using bind means that we get to keep useful line numbers in the console
    var debuglog = console.log.bind(console);
 } else {
-    var debuglog = function () {};
+    var debuglog = function() {};
 }

 module.exports = React.createClass({
@ -146,7 +146,7 @@ module.exports = React.createClass({
            showTopUnreadMessagesBar: false,

            auxPanelMaxHeight: undefined,
-        }
+        };
    },

    componentWillMount: function() {
@ -674,8 +674,9 @@ module.exports = React.createClass({
    },

    onSearchResultsFillRequest: function(backwards) {
-        if (!backwards)
+        if (!backwards) {
            return q(false);
+        }

        if (this.state.searchResults.next_batch) {
            debuglog("requesting more search results");
@ -758,7 +759,7 @@ module.exports = React.createClass({
        }).then(() => {
            var sign_url = this.props.thirdPartyInvite ? this.props.thirdPartyInvite.inviteSignUrl : undefined;
            return MatrixClientPeg.get().joinRoom(this.props.roomAddress,
-                                                  { inviteSignUrl: sign_url } )
+                                                  { inviteSignUrl: sign_url } );
        }).then(function(resp) {
            var roomId = resp.roomId;

@ -962,7 +963,7 @@ module.exports = React.createClass({
            // For overlapping highlights,
            // favour longer (more specific) terms first
            highlights = highlights.sort(function(a, b) {
-                return b.length - a.length });
+                return b.length - a.length; });

            self.setState({
                searchHighlights: highlights,
@ -1025,7 +1026,7 @@ module.exports = React.createClass({
            if (scrollPanel) {
                scrollPanel.checkScroll();
            }
-        }
+        };

        var lastRoomId;

@ -1090,7 +1091,7 @@ module.exports = React.createClass({
        }

        this.refs.room_settings.save().then((results) => {
-            var fails = results.filter(function(result) { return result.state !== "fulfilled" });
+            var fails = results.filter(function(result) { return result.state !== "fulfilled"; });
            console.log("Settings saved with %s errors", fails.length);
            if (fails.length) {
                fails.forEach(function(result) {
@ -1099,7 +1100,7 @@ module.exports = React.createClass({
                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                Modal.createDialog(ErrorDialog, {
                    title: "Failed to save settings",
-                    description: fails.map(function(result) { return result.reason }).join("\n"),
+                    description: fails.map(function(result) { return result.reason; }).join("\n"),
                });
                // still editing room settings
            }
@ -1183,7 +1184,7 @@ module.exports = React.createClass({
        this.setState({ searching: true });
    },

-    onCancelSearchClick: function () {
+    onCancelSearchClick: function() {
        this.setState({
            searching: false,
            searchResults: null,
@ -1208,8 +1209,9 @@ module.exports = React.createClass({

    // decide whether or not the top 'unread messages' bar should be shown
    _updateTopUnreadMessagesBar: function() {
-        if (!this.refs.messagePanel)
+        if (!this.refs.messagePanel) {
            return;
+        }

        var pos = this.refs.messagePanel.getReadMarkerPosition();

@ -1498,7 +1500,7 @@ module.exports = React.createClass({

        if (ContentMessages.getCurrentUploads().length > 0) {
            var UploadBar = sdk.getComponent('structures.UploadBar');
-            statusBar = <UploadBar room={this.state.room} />
+            statusBar = <UploadBar room={this.state.room} />;
        } else if (!this.state.searchResults) {
            var RoomStatusBar = sdk.getComponent('structures.RoomStatusBar');

@ -1513,7 +1515,7 @@ module.exports = React.createClass({
                onCancelAllClick={this.onCancelAllClick}
                onScrollToBottomClick={this.jumpToLiveTimeline}
                onResize={this.onChildResize}
-                />
+                />;
        }

        var aux = null;
@ -1569,7 +1571,7 @@ module.exports = React.createClass({
            messageComposer =
                <MessageComposer
                    room={this.state.room} onResize={this.onChildResize} uploadFile={this.uploadFile}
-                    callState={this.state.callState} tabComplete={this.tabComplete} opacity={ this.props.opacity }/>
+                    callState={this.state.callState} tabComplete={this.tabComplete} opacity={ this.props.opacity }/>;
        }

        // TODO: Why aren't we storing the term/scope/count in this format
@ -1597,14 +1599,14 @@ module.exports = React.createClass({
                        <img src={call.isLocalVideoMuted() ? "img/video-unmute.svg" : "img/video-mute.svg"}
                             alt={call.isLocalVideoMuted() ? "Click to unmute video" : "Click to mute video"}
                             width="31" height="27"/>
-                    </div>
+                    </div>;
            }
            voiceMuteButton =
                <div className="mx_RoomView_voipButton" onClick={this.onMuteAudioClick}>
                    <img src={call.isMicrophoneMuted() ? "img/voice-unmute.svg" : "img/voice-mute.svg"}
                         alt={call.isMicrophoneMuted() ? "Click to unmute audio" : "Click to mute audio"}
                         width="21" height="26"/>
-                </div>
+                </div>;

            // wrap the existing status bar into a 'callStatusBar' which adds more knobs.
            statusBar =
@ -1614,7 +1616,7 @@ module.exports = React.createClass({
                    { zoomButton }
                    { statusBar }
                    <TintableSvg className="mx_RoomView_voipChevron" src="img/voip-chevron.svg" width="22" height="17"/>
-                </div>
+                </div>;
        }

        // if we have search results, we keep the messagepanel (so that it preserves its
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@ -34,7 +34,7 @@ if (DEBUG_SCROLL) {
    // using bind means that we get to keep useful line numbers in the console
    var debuglog = console.log.bind(console);
 } else {
-    var debuglog = function () {};
+    var debuglog = function() {};
 }

 /* This component implements an intelligent scrolling list.
@ -600,7 +600,7 @@ module.exports = React.createClass({
                    stuckAtBottom: false,
                    trackedScrollToken: node.dataset.scrollToken,
                    pixelOffset: wrapperRect.bottom - boundingRect.bottom,
-                }
+                };
                debuglog("Saved scroll state", this.scrollState);
                return;
            }
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@ -38,7 +38,7 @@ if (DEBUG) {
    // using bind means that we get to keep useful line numbers in the console
    var debuglog = console.log.bind(console);
 } else {
-    var debuglog = function () {};
+    var debuglog = function() {};
 }

 /*
@ -322,7 +322,7 @@ var TimelinePanel = React.createClass({
        });
    },

-    onMessageListScroll: function () {
+    onMessageListScroll: function() {
        if (this.props.onScroll) {
            this.props.onScroll();
        }
@ -387,7 +387,7 @@ var TimelinePanel = React.createClass({

            // if we're at the end of the live timeline, append the pending events
            if (this.props.timelineSet.room && !this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
-                events.push(... this.props.timelineSet.room.getPendingEvents());
+                events.push(...this.props.timelineSet.room.getPendingEvents());
            }

            var updatedState = {events: events};
@ -564,8 +564,9 @@ var TimelinePanel = React.createClass({

        // first find where the current RM is
        for (var i = 0; i < events.length; i++) {
-            if (events[i].getId() == this.state.readMarkerEventId)
+            if (events[i].getId() == this.state.readMarkerEventId) {
                break;
+            }
        }
        if (i >= events.length) {
            return;
@ -644,7 +645,7 @@ var TimelinePanel = React.createClass({
        var tl = this.props.timelineSet.getTimelineForEvent(rmId);
        var rmTs;
        if (tl) {
-            var event = tl.getEvents().find((e) => { return e.getId() == rmId });
+            var event = tl.getEvents().find((e) => { return e.getId() == rmId; });
            if (event) {
                rmTs = event.getTs();
            }
@ -821,7 +822,7 @@ var TimelinePanel = React.createClass({
                description: message,
                onFinished: onFinished,
            });
-        }
+        };

        var prom = this._timelineWindow.load(eventId, INITIAL_SIZE);

@ -843,7 +844,7 @@ var TimelinePanel = React.createClass({
                timelineLoading: true,
            });

-            prom = prom.then(onLoaded, onError)
+            prom = prom.then(onLoaded, onError);
        }

        prom.done();
@ -868,7 +869,7 @@ var TimelinePanel = React.createClass({

        // if we're at the end of the live timeline, append the pending events
        if (!this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
-            events.push(... this.props.timelineSet.getPendingEvents());
+            events.push(...this.props.timelineSet.getPendingEvents());
        }

        return events;
@ -930,8 +931,9 @@ var TimelinePanel = React.createClass({
    _getCurrentReadReceipt: function(ignoreSynthesized) {
        var client = MatrixClientPeg.get();
        // the client can be null on logout
-        if (client == null)
+        if (client == null) {
            return null;
+        }

        var myUserId = client.credentials.userId;
        return this.props.timelineSet.room.getEventReadUpTo(myUserId, ignoreSynthesized);
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@ -57,7 +57,7 @@ module.exports = React.createClass({displayName: 'UploadBar',
        // }];

        if (uploads.length == 0) {
-            return <div />
+            return <div />;
        }

        var upload;
@ -68,7 +68,7 @@ module.exports = React.createClass({displayName: 'UploadBar',
            }
        }
        if (!upload) {
-            return <div />
+            return <div />;
        }

        var innerProgressStyle = {
@ -76,7 +76,7 @@ module.exports = React.createClass({displayName: 'UploadBar',
        };
        var uploadedSize = filesize(upload.loaded);
        var totalSize = filesize(upload.total);
-        if (uploadedSize.replace(/^.* /,'') === totalSize.replace(/^.* /,'')) {
+        if (uploadedSize.replace(/^.* /, '') === totalSize.replace(/^.* /, '')) {
            uploadedSize = uploadedSize.replace(/ .*/, '');
        }

--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -346,8 +346,8 @@ module.exports = React.createClass({
            this.setState({email_add_pending: false});
            if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
                var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                var message = "Unable to verify email address. "
-                message += "Please check your email and click on the link it contains. Once this is done, click continue."
+                var message = "Unable to verify email address. ";
+                message += "Please check your email and click on the link it contains. Once this is done, click continue.";
                Modal.createDialog(QuestionDialog, {
                    title: "Verification Pending",
                    description: message,
@ -417,7 +417,7 @@ module.exports = React.createClass({
            <label htmlFor="urlPreviewsDisabled">
                Disable inline URL previews by default
            </label>
-        </div>
+        </div>;
    },

    _renderSyncedSetting: function(setting) {
@ -430,7 +430,7 @@ module.exports = React.createClass({
            <label htmlFor={ setting.id }>
                { setting.label }
            </label>
-        </div>
+        </div>;
    },

    _renderThemeSelector: function(setting) {
@ -442,7 +442,7 @@ module.exports = React.createClass({
                   defaultChecked={ this._syncedSettings[setting.id] === setting.value }
                   onChange={ e => {
                            if (e.target.checked) {
-                                UserSettingsStore.setSyncedSetting(setting.id, setting.value)
+                                UserSettingsStore.setSyncedSetting(setting.id, setting.value);
                            }
                            dis.dispatch({
                                action: 'set_theme',
@ -454,7 +454,7 @@ module.exports = React.createClass({
            <label htmlFor={ setting.id + "_" + setting.value }>
                { setting.label }
            </label>
-        </div>
+        </div>;
    },

    _renderCryptoInfo: function() {
@ -467,8 +467,8 @@ module.exports = React.createClass({
                <h3>Cryptography</h3>
                <div className="mx_UserSettings_section mx_UserSettings_cryptoSection">
                    <ul>
-                        <li><label>Device ID:</label>   <span><code>{deviceId}</code></span></li>
-                        <li><label>Device key:</label>  <span><code><b>{identityKey}</b></code></span></li>
+                        <li><label>Device ID:</label>             <span><code>{deviceId}</code></span></li>
+                        <li><label>Device key:</label>            <span><code><b>{identityKey}</b></code></span></li>
                    </ul>
                </div>
            </div>
@ -485,7 +485,7 @@ module.exports = React.createClass({
        );
    },

-    _renderLabs: function () {
+    _renderLabs: function() {
        // default to enabled if undefined
        if (this.props.enableLabs === false) return null;

@ -521,7 +521,7 @@ module.exports = React.createClass({
                    {features}
                </div>
            </div>
-        )
+        );
    },

    _renderDeactivateAccount: function() {
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@ -58,7 +58,7 @@ module.exports = React.createClass({
            this.setState({
                progress: null
            });
-        })
+        });
    },

    onVerify: function(ev) {
@ -71,7 +71,7 @@ module.exports = React.createClass({
            this.setState({ progress: "complete" });
        }, (err) => {
            this.showErrorDialog(err.message);
-        })
+        });
    },

    onSubmitForm: function(ev) {
@ -129,7 +129,7 @@ module.exports = React.createClass({
        var resetPasswordJsx;

        if (this.state.progress === "sending_email") {
-            resetPasswordJsx = <Spinner />
+            resetPasswordJsx = <Spinner />;
        }
        else if (this.state.progress === "sent_email") {
            resetPasswordJsx = (
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@ -173,7 +173,7 @@ module.exports = React.createClass({
    },

    _getCurrentFlowStep: function() {
-        return this._loginLogic ? this._loginLogic.getCurrentFlowStep() : null
+        return this._loginLogic ? this._loginLogic.getCurrentFlowStep() : null;
    },

    _setStateFromError: function(err, isLoginAttempt) {
@ -195,7 +195,7 @@ module.exports = React.createClass({
        }

        let errorText = "Error: Problem communicating with the given homeserver " +
-                (errCode ? "(" + errCode + ")" : "")
+                (errCode ? "(" + errCode + ")" : "");

        if (err.cors === 'rejected') {
            if (window.location.protocol === 'https:' &&
@ -258,7 +258,7 @@ module.exports = React.createClass({
            loginAsGuestJsx =
                <a className="mx_Login_create" onClick={this._onLoginAsGuestClick} href="#">
                    Login as guest
-                </a>
+                </a>;
        }

        var returnToAppJsx;
@ -266,7 +266,7 @@ module.exports = React.createClass({
            returnToAppJsx =
                <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
                    Return to app
-                </a>
+                </a>;
        }

        return (
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@ -333,7 +333,7 @@ module.exports = React.createClass({
            returnToAppJsx =
                <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
                    Return to app
-                </a>
+                </a>;
        }

        return (
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@ -41,7 +41,7 @@ module.exports = React.createClass({
            height: 40,
            resizeMethod: 'crop',
            defaultToInitialLetter: true
-        }
+        };
    },

    getInitialState: function() {
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@ -42,7 +42,7 @@ module.exports = React.createClass({
            height: 40,
            resizeMethod: 'crop',
            viewUserOnClick: false,
-        }
+        };
    },

    getInitialState: function() {
@ -64,7 +64,7 @@ module.exports = React.createClass({
                                         props.width,
                                         props.height,
                                         props.resizeMethod)
-        }
+        };
    },

    render: function() {
@ -78,7 +78,7 @@ module.exports = React.createClass({
                    action: 'view_user',
                    member: this.props.member,
                });
-            }
+            };
        }

        return (
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@ -39,7 +39,7 @@ module.exports = React.createClass({
            height: 36,
            resizeMethod: 'crop',
            oobData: {},
-        }
+        };
    },

    getInitialState: function() {
@ -51,7 +51,7 @@ module.exports = React.createClass({
    componentWillReceiveProps: function(newProps) {
        this.setState({
            urls: this.getImageUrls(newProps)
-        })
+        });
    },

    getImageUrls: function(props) {
--- a/src/components/views/create_room/Presets.js
+++ b/src/components/views/create_room/Presets.js
@ -40,7 +40,7 @@ module.exports = React.createClass({
    },

    onValueChanged: function(ev) {
-        this.props.onChange(ev.target.value)
+        this.props.onChange(ev.target.value);
    },

    render: function() {
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@ -171,7 +171,7 @@ module.exports = React.createClass({
                inviteList: inviteList,
                queryList: [],
            });
-        }
+        };
    },

    onClick: function(index) {
@ -402,10 +402,10 @@ module.exports = React.createClass({
        var error;
        var addressSelector;
        if (this.state.error) {
-            error = <div className="mx_ChatInviteDialog_error">You have entered an invalid contact. Try using their Matrix ID or email address.</div>
+            error = <div className="mx_ChatInviteDialog_error">You have entered an invalid contact. Try using their Matrix ID or email address.</div>;
        } else {
            addressSelector = (
-                <AddressSelector ref={(ref) => {this.addressSelector = ref}}
+                <AddressSelector ref={(ref) => {this.addressSelector = ref;}}
                    addressList={ this.state.queryList }
                    onSelected={ this.onSelected }
                    truncateAt={ TRUNCATE_QUERY_LIST } />
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@ -81,7 +81,7 @@ export default class DeactivateAccountDialog extends React.Component {
        if (this.state.errStr) {
            error = <div className="error">
                {this.state.errStr}
-            </div>
+            </div>;
            passwordBoxClass = 'error';
        }

@ -92,7 +92,7 @@ export default class DeactivateAccountDialog extends React.Component {
        if (!this.state.busy) {
            cancelButton = <button onClick={this._onCancel} autoFocus={true}>
                Cancel
-            </button>
+            </button>;
        }

        return (
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@ -129,7 +129,7 @@ module.exports = React.createClass({

    _maxSelected: function(list) {
        var listSize = list.length === 0 ? 0 : list.length - 1;
-        var maxSelected = listSize > (this.props.truncateAt - 1) ? (this.props.truncateAt - 1) : listSize
+        var maxSelected = listSize > (this.props.truncateAt - 1) ? (this.props.truncateAt - 1) : listSize;
        return maxSelected;
    },

@ -140,7 +140,7 @@ module.exports = React.createClass({
        });

        return (
-            <div className={classes} ref={(ref) => {this.scrollElement = ref}}>
+            <div className={classes} ref={(ref) => {this.scrollElement = ref;}}>
                { this.createAddressListTiles() }
            </div>
        );
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@ -108,7 +108,7 @@ module.exports = React.createClass({
            info = (
                <div className={unknownMxClasses}>{ this.props.address }</div>
            );
-        } else if (email)  {
+        } else if (email) {
            var emailClasses = classNames({
                "mx_AddressTile_email": true,
                "mx_AddressTile_justified": this.props.justified,
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@ -42,8 +42,8 @@ export default React.createClass({
                    <div className="mx_UserSettings_cryptoSection">
                        <ul>
                            <li><label>Device name:</label> <span>{ this.props.device.getDisplayName() }</span></li>
-                            <li><label>Device ID:</label>   <span><code>{ this.props.device.deviceId}</code></span></li>
-                            <li><label>Device key:</label>  <span><code><b>{ this.props.device.getFingerprint() }</b></code></span></li>
+                            <li><label>Device ID:</label>             <span><code>{ this.props.device.deviceId}</code></span></li>
+                            <li><label>Device key:</label>            <span><code><b>{ this.props.device.getFingerprint() }</b></code></span></li>
                        </ul>
                    </div>
                    <p>
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@ -57,7 +57,7 @@ module.exports = React.createClass({
    getInitialState: function() {
        return {
            phase: this.Phases.Display,
-        }
+        };
    },

    componentWillReceiveProps: function(nextProps) {
@ -164,7 +164,7 @@ module.exports = React.createClass({

        this.setState({
            phase: this.Phases.Edit,
-        })
+        });
    },

    onFocus: function(ev) {
@ -197,9 +197,9 @@ module.exports = React.createClass({
        sel.removeAllRanges();

        if (this.props.blurToCancel)
-            this.cancelEdit();
+            {this.cancelEdit();}
        else
-            this.onFinish(ev);
+            {this.onFinish(ev);}

        this.showPlaceholder(!this.value);
    },
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@ -73,7 +73,7 @@ module.exports = React.createClass({
    getValue: function() {
        var value;
        if (this.refs.select) {
-            value = reverseRoles[ this.refs.select.value ];
+            value = reverseRoles[this.refs.select.value];
            if (this.refs.custom) {
                if (value === undefined) value = parseInt( this.refs.custom.value );
            }
@ -86,10 +86,10 @@ module.exports = React.createClass({
        if (this.state.custom) {
            var input;
            if (this.props.disabled) {
-                input = <span>{ this.props.value }</span>
+                input = <span>{ this.props.value }</span>;
            }
            else {
-                input = <input ref="custom" type="text" size="3" defaultValue={ this.props.value } onBlur={ this.onCustomBlur } onKeyDown={ this.onCustomKeyDown }/>
+                input = <input ref="custom" type="text" size="3" defaultValue={ this.props.value } onBlur={ this.onCustomBlur } onKeyDown={ this.onCustomKeyDown }/>;
            }
            customPicker = <span> of { input }</span>;
        }
@ -115,7 +115,7 @@ module.exports = React.createClass({
                    <option value="Moderator">Moderator (50)</option>
                    <option value="Admin">Admin (100)</option>
                    <option value="Custom">Custom level</option>
-                </select>
+                </select>;
        }

        return (
--- a/src/components/views/elements/ProgressBar.js
+++ b/src/components/views/elements/ProgressBar.js
@ -35,4 +35,4 @@ module.exports = React.createClass({
            <div className="mx_ProgressBar"><div className="mx_ProgressBar_fill" style={progressStyle}></div></div>
        );
    }
-});
+});
--- a/src/components/views/elements/TruncatedList.js
+++ b/src/components/views/elements/TruncatedList.js
@ -55,7 +55,7 @@ module.exports = React.createClass({
                overflowJsx = this.props.createOverflowElement(
                    overflowCount, childCount
                );
-                
+
                // cut out the overflow elements
                childArray.splice(childCount - overflowCount, overflowCount);
                childsJsx = childArray; // use what is left
--- a/src/components/views/elements/UserSelector.js
+++ b/src/components/views/elements/UserSelector.js
@ -56,7 +56,7 @@ module.exports = React.createClass({
            <div>
                <ul className="mx_UserSelector_UserIdList" ref="list">
                    {this.props.selected_users.map(function(user_id, i) {
-                        return <li key={user_id}>{user_id} - <span onClick={function() {self.removeUser(user_id);}}>X</span></li>
+                        return <li key={user_id}>{user_id} - <span onClick={function() {self.removeUser(user_id);}}>X</span></li>;
                    })}
                </ul>
                <input type="text" ref="user_id_input" defaultValue="" className="mx_UserSelector_userIdInput" placeholder="ex. @bob:example.com"/>
--- a/src/components/views/login/CaptchaForm.js
+++ b/src/components/views/login/CaptchaForm.js
@ -52,7 +52,7 @@ module.exports = React.createClass({
            this._onCaptchaLoaded();
        } else {
            console.log("Loading recaptcha script...");
-            window.mx_on_recaptcha_loaded = () => {this._onCaptchaLoaded()};
+            window.mx_on_recaptcha_loaded = () => {this._onCaptchaLoaded();};
            var protocol = global.location.protocol;
            if (protocol === "file:") {
                var warning = document.createElement('div');
@ -101,7 +101,7 @@ module.exports = React.createClass({
        } catch (e) {
            this.setState({
                errorText: e.toString(),
-            })
+            });
        }
    },

--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@ -70,7 +70,7 @@ export const PasswordAuthEntry = React.createClass({
        });
    },

-    _onPasswordFieldChange: function (ev) {
+    _onPasswordFieldChange: function(ev) {
        // enable the submit button iff the password is non-empty
        this.props.setSubmitButtonEnabled(Boolean(ev.target.value));
    },
@ -209,4 +209,4 @@ export function getEntryComponentForLoginType(loginType) {
        }
    }
    return FallbackAuthEntry;
-};
+}
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@ -169,7 +169,7 @@ module.exports = React.createClass({

    validateField: function(field_id) {
        var pwd1 = this.refs.password.value.trim();
-        var pwd2 = this.refs.passwordConfirm.value.trim()
+        var pwd2 = this.refs.passwordConfirm.value.trim();

        switch (field_id) {
            case FIELD_EMAIL:
@ -283,7 +283,7 @@ module.exports = React.createClass({
                        autoFocus={true} placeholder="Email address (optional)"
                        defaultValue={this.props.defaultEmail}
                        className={this._classForField(FIELD_EMAIL, 'mx_Login_field')}
-                        onBlur={function() {self.validateField(FIELD_EMAIL)}}
+                        onBlur={function() {self.validateField(FIELD_EMAIL);}}
                        value={self.state.email}/>
                    {emailSuffix ? <input className="mx_Login_field" value={emailSuffix} disabled/> : null }
                </div>
@ -293,8 +293,8 @@ module.exports = React.createClass({
                    <select
                        defaultValue="-1"
                        className="mx_Login_field"
-                        onBlur={function() {self.validateField(FIELD_EMAIL)}}
-                        onChange={function(ev) {self.onSelectTeam(ev.target.value)}}
+                        onBlur={function() {self.validateField(FIELD_EMAIL);}}
+                        onChange={function(ev) {self.onSelectTeam(ev.target.value);}}
                    >
                        <option key="-1" value="-1">No team</option>
                        {this.props.teamsConfig.teams.map((t, index) => {
@ -327,7 +327,7 @@ module.exports = React.createClass({

        var placeholderUserName = "User name";
        if (this.props.guestUsername) {
-            placeholderUserName += " (default: " + this.props.guestUsername + ")"
+            placeholderUserName += " (default: " + this.props.guestUsername + ")";
        }

        return (
@ -341,20 +341,20 @@ module.exports = React.createClass({
                    <input type="text" ref="username"
                        placeholder={ placeholderUserName } defaultValue={this.props.defaultUsername}
                        className={this._classForField(FIELD_USERNAME, 'mx_Login_field')}
-                        onBlur={function() {self.validateField(FIELD_USERNAME)}} />
+                        onBlur={function() {self.validateField(FIELD_USERNAME);}} />
                    <br />
                    { this.props.guestUsername ?
                        <div className="mx_Login_fieldLabel">Setting a user name will create a fresh account</div> : null
                    }
                    <input type="password" ref="password"
                        className={this._classForField(FIELD_PASSWORD, 'mx_Login_field')}
-                        onBlur={function() {self.validateField(FIELD_PASSWORD)}}
+                        onBlur={function() {self.validateField(FIELD_PASSWORD);}}
                        placeholder="Password" defaultValue={this.props.defaultPassword} />
                    <br />
                    <input type="password" ref="passwordConfirm"
                        placeholder="Confirm password"
                        className={this._classForField(FIELD_PASSWORD_CONFIRM, 'mx_Login_field')}
-                        onBlur={function() {self.validateField(FIELD_PASSWORD_CONFIRM)}}
+                        onBlur={function() {self.validateField(FIELD_PASSWORD_CONFIRM);}}
                        defaultValue={this.props.defaultPassword} />
                    <br />
                    {registerButton}
--- a/src/components/views/login/ServerConfig.js
+++ b/src/components/views/login/ServerConfig.js
@ -64,10 +64,10 @@ module.exports = React.createClass({
            hs_url: this.props.customHsUrl,
            is_url: this.props.customIsUrl,
            // if withToggleButton is false, then show the config all the time given we have no way otherwise of making it visible
-            configVisible: !this.props.withToggleButton || 
+            configVisible: !this.props.withToggleButton ||
                           (this.props.customHsUrl !== this.props.defaultHsUrl) ||
                           (this.props.customIsUrl !== this.props.defaultIsUrl)
-        }
+        };
    },

    onHomeserverChanged: function(ev) {
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@ -31,7 +31,7 @@ export default class MAudioBody extends React.Component {
            decryptedUrl: null,
            decryptedBlob: null,
            error: null,
-        }
+        };
    }
    onPlayToggle() {
        this.setState({
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@ -281,7 +281,7 @@ module.exports = React.createClass({
                            decryptedBlob: blob,
                        });
                    }).catch((err) => {
-                        console.warn("Unable to decrypt attachment: ", err)
+                        console.warn("Unable to decrypt attachment: ", err);
                        Modal.createDialog(ErrorDialog, {
                            description: "Error decrypting attachment"
                        });
@ -372,7 +372,7 @@ module.exports = React.createClass({
            var extra = text ? (': ' + text) : '';
            return <span className="mx_MFileBody">
                Invalid file{extra}
-            </span>
+            </span>;
        }
    },
 });
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@ -119,7 +119,7 @@ module.exports = React.createClass({
            if (content.info.thumbnail_file) {
                thumbnailPromise = decryptFile(
                    content.info.thumbnail_file
-                ).then(function (blob) {
+                ).then(function(blob) {
                    return readBlobAsDataUri(blob);
                });
            }
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@ -111,7 +111,7 @@ module.exports = React.createClass({
                    this.props.onWidgetLoad();
                });
            }).catch((err) => {
-                console.warn("Unable to decrypt attachment: ", err)
+                console.warn("Unable to decrypt attachment: ", err);
                // Set a placeholder image when we can't decrypt the image.
                this.setState({
                    error: err,
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@ -200,7 +200,7 @@ module.exports = React.createClass({
                    global.localStorage.removeItem("hide_preview_" + self.props.mxEvent.getId());
                }
            },
-        }
+        };
    },

    onStarterLinkClick: function(starterLink, ev) {
@ -230,8 +230,8 @@ module.exports = React.createClass({
                    if (!confirmed) {
                        return;
                    }
-                    let width  = window.screen.width  > 1024 ? 1024 : window.screen.width;
-                    let height = window.screen.height > 800  ? 800 : window.screen.height;
+                    let width = window.screen.width > 1024 ? 1024 : window.screen.width;
+                    let height = window.screen.height > 800 ? 800 : window.screen.height;
                    let left = (window.screen.width - width) / 2;
                    let top = (window.screen.height - height) / 2;
                    window.open(completeUrl, '_blank', `height=${height}, width=${width}, top=${top}, left=${left},`);
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@ -103,13 +103,13 @@ module.exports = React.createClass({
        }
        if (oldCanonicalAlias !== this.state.canonicalAlias) {
            console.log("AliasSettings: Updating canonical alias");
-            promises = [ q.all(promises).then(
+            promises = [q.all(promises).then(
                MatrixClientPeg.get().sendStateEvent(
                    this.props.roomId, "m.room.canonical_alias", {
                        alias: this.state.canonicalAlias
                    }, ""
                )
-            ) ];
+            )];
        }

        return promises;
@ -144,7 +144,7 @@ module.exports = React.createClass({
            // XXX: do we need to deep copy aliases before editing it?
            this.state.domainToAliases[domain] = this.state.domainToAliases[domain] || [];
            this.state.domainToAliases[domain].push(alias);
-            this.setState({ 
+            this.setState({
                domainToAliases: this.state.domainToAliases
            });

@ -152,9 +152,9 @@ module.exports = React.createClass({
            this.refs.add_alias.setValue(''); // FIXME
        }
        else {
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");            
+            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
            Modal.createDialog(ErrorDialog, {
-                title: "Invalid alias format", 
+                title: "Invalid alias format",
                description: "'" + alias + "' is not a valid format for an alias",
            });
        }
@ -168,9 +168,9 @@ module.exports = React.createClass({
            this.state.domainToAliases[domain][index] = alias;
        }
        else {
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");            
+            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
            Modal.createDialog(ErrorDialog, {
-                title: "Invalid address format", 
+                title: "Invalid address format",
                description: "'" + alias + "' is not a valid format for an address",
            });
        }
@ -183,7 +183,7 @@ module.exports = React.createClass({
        // would be to arbitrarily deepcopy to a temp variable and then setState
        // that, but why bother when we can cut this corner.
        var alias = this.state.domainToAliases[domain].splice(index, 1);
-        this.setState({ 
+        this.setState({
            domainToAliases: this.state.domainToAliases
        });
    },
@ -310,4 +310,4 @@ module.exports = React.createClass({
            </div>
        );
    }
-});
+});
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@ -135,7 +135,7 @@ module.exports = React.createClass({
                            </div>
                        );
                    }
-                    var boundClick = this._onColorSchemeChanged.bind(this, i)
+                    var boundClick = this._onColorSchemeChanged.bind(this, i);
                    return (
                        <div className="mx_RoomSettings_roomColor"
                              key={ "room_color_" + i }
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@ -121,13 +121,13 @@ module.exports = React.createClass({
                           onChange={ this.onGlobalDisableUrlPreviewChange }
                           checked={ this.state.globalDisableUrlPreview } />
                    Disable URL previews by default for participants in this room
-                </label>
+                </label>;
        }
        else {
            disableRoomPreviewUrls =
                <label>
                    URL previews are { this.state.globalDisableUrlPreview ? "disabled" : "enabled" } by default for participants in this room.
-                </label>
+                </label>;
        }

        return (
@ -154,4 +154,4 @@ module.exports = React.createClass({
        );

    }
-});
+});
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@ -93,8 +93,8 @@ module.exports = React.createClass({
            }
            else {
                joinText = (<span>
-                    Join as <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice')}} 
-                               href="#">voice</a> or <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video') }}
+                    Join as <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}}
+                               href="#">voice</a> or <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video'); }}
                               href="#">video</a>.
                </span>);

--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@ -149,13 +149,13 @@ module.exports = WithMatrixClient(React.createClass({
        this.props.mxEvent.on("Event.decrypted", this._onDecrypted);
    },

-    componentWillReceiveProps: function (nextProps) {
+    componentWillReceiveProps: function(nextProps) {
        if (nextProps.mxEvent !== this.props.mxEvent) {
            this._verifyEvent(nextProps.mxEvent);
        }
    },

-    shouldComponentUpdate: function (nextProps, nextState) {
+    shouldComponentUpdate: function(nextProps, nextState) {
        if (!ObjectUtils.shallowEqual(this.state, nextState)) {
            return true;
        }
@ -259,7 +259,7 @@ module.exports = WithMatrixClient(React.createClass({

    onEditClicked: function(e) {
        var MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
-        var buttonRect = e.target.getBoundingClientRect()
+        var buttonRect = e.target.getBoundingClientRect();

        // The window X and Y offsets are to adjust position when zoomed in to page
        var x = buttonRect.right + window.pageXOffset;
@ -293,7 +293,7 @@ module.exports = WithMatrixClient(React.createClass({
        // If it is, we want to display the complete date along with the HH:MM:SS,
        // rather than just HH:MM:SS.
        let dayAfterEvent = new Date(this.props.mxEvent.getTs());
-        dayAfterEvent.setDate(dayAfterEvent.getDate() + 1)
+        dayAfterEvent.setDate(dayAfterEvent.getDate() + 1);
        dayAfterEvent.setHours(0);
        dayAfterEvent.setMinutes(0);
        dayAfterEvent.setSeconds(0);
@ -369,7 +369,7 @@ module.exports = WithMatrixClient(React.createClass({
        var event = this.props.mxEvent;

        Modal.createDialogAsync((cb) => {
-            require(['../../../async-components/views/dialogs/EncryptedEventDialog'], cb)
+            require(['../../../async-components/views/dialogs/EncryptedEventDialog'], cb);
        }, {
            event: event,
        });
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@ -60,13 +60,15 @@ module.exports = React.createClass({
    },

    componentDidMount: function() {
-        if (this.refs.description)
+        if (this.refs.description) {
            linkifyElement(this.refs.description, linkifyMatrix.options);
+        }
    },

    componentDidUpdate: function() {
-        if (this.refs.description)
+        if (this.refs.description) {
            linkifyElement(this.refs.description, linkifyMatrix.options);
+        }
    },

    componentWillUnmount: function() {
@ -116,7 +118,7 @@ module.exports = React.createClass({
        if (image) {
            img = <div className="mx_LinkPreviewWidget_image" style={{ height: thumbHeight }}>
                    <img style={{ maxWidth: imageMaxWidth, maxHeight: imageMaxHeight }} src={ image } onClick={ this.onImageClick }/>
-                  </div>
+                  </div>;
        }

        return (
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@ -60,7 +60,7 @@ export default class MemberDeviceInfo extends React.Component {
            </div>
        );
    }
-};
+}

 MemberDeviceInfo.displayName = 'MemberDeviceInfo';
 MemberDeviceInfo.propTypes = {
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@ -64,7 +64,7 @@ module.exports = WithMatrixClient(React.createClass({
            updating: 0,
            devicesLoading: true,
            devices: null,
-        }
+        };
    },

    componentWillMount: function() {
@ -202,7 +202,7 @@ module.exports = WithMatrixClient(React.createClass({
        }

        var cancelled = false;
-        this._cancelDeviceList = function() { cancelled = true; }
+        this._cancelDeviceList = function() { cancelled = true; };

        var client = this.props.matrixClient;
        var self = this;
@ -529,7 +529,7 @@ module.exports = WithMatrixClient(React.createClass({
        });
    },

-    onMemberAvatarClick: function () {
+    onMemberAvatarClick: function() {
        var avatarUrl = this.props.member.user ? this.props.member.user.avatarUrl : this.props.member.events.member.getContent().avatar_url;
        if(!avatarUrl) return;

@ -620,7 +620,7 @@ module.exports = WithMatrixClient(React.createClass({
                    <img src="img/create-big.svg" width="26" height="26" />
                </div>
                <div className={labelClasses}><i>Start new chat</i></div>
-            </div>
+            </div>;

            startChat = <div>
                <h3>Direct chats</h3>
@ -654,7 +654,7 @@ module.exports = WithMatrixClient(React.createClass({
            var giveOpLabel = this.state.isTargetMod ? "Revoke Moderator" : "Make Moderator";
            giveModButton = <div className="mx_MemberInfo_field" onClick={this.onModToggle}>
                {giveOpLabel}
-            </div>
+            </div>;
        }

        // TODO: we should have an invite button if this MemberInfo is showing a user who isn't actually in the current room yet
@ -672,7 +672,7 @@ module.exports = WithMatrixClient(React.createClass({
                        {banButton}
                        {giveModButton}
                    </div>
-                </div>
+                </div>;
        }

        const memberName = this.props.member.name;
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@ -32,7 +32,7 @@ var SHARE_HISTORY_WARNING =
        Newly invited users will see the history of this room. <br/>
        If you'd prefer invited users not to see messages that were sent before they joined, <br/>
        turn off, 'Share message history with new users' in the settings for this room.
-    </span>
+    </span>;

 module.exports = React.createClass({
    displayName: 'MemberList',
@ -207,7 +207,7 @@ module.exports = React.createClass({
        // For now we'll pretend this is any entity. It should probably be a separate tile.
        var EntityTile = sdk.getComponent("rooms.EntityTile");
        var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        var text = "and " + overflowCount + " other" + (overflowCount > 1 ? "s" : "") +  "...";
+        var text = "and " + overflowCount + " other" + (overflowCount > 1 ? "s" : "") + "...";
        return (
            <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
                <BaseAvatar url="img/ellipsis.svg" name="..." width={36} height={36} />
@ -338,8 +338,8 @@ module.exports = React.createClass({
                    }
                    memberList.push(
                        <EntityTile key={e.getStateKey()} name={e.getContent().display_name} />
-                    )
-                })
+                    );
+                });
            }
        }

--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@ -46,7 +46,7 @@ module.exports = React.createClass({
            (this.user_last_modified_time === undefined ||
            this.user_last_modified_time < nextProps.member.user.getLastModifiedTime())
        ) {
-            return true
+            return true;
        }
        return false;
    },
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@ -367,7 +367,7 @@ export default class MessageComposer extends React.Component {
            </div>
        );
    }
-};
+}

 MessageComposer.propTypes = {
    tabComplete: React.PropTypes.any,
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@ -443,12 +443,12 @@ export default class MessageComposerInput extends React.Component {
                selection = this.state.editorState.getSelection();

            let modifyFn = {
-                bold: text => `**${text}**`,
-                italic: text => `*${text}*`,
-                underline: text => `_${text}_`, // there's actually no valid underline in Markdown, but *shrug*
-                strike: text => `~~${text}~~`,
-                code: text => `\`${text}\``,
-                blockquote: text => text.split('\n').map(line => `> ${line}\n`).join(''),
+                'bold': text => `**${text}**`,
+                'italic': text => `*${text}*`,
+                'underline': text => `_${text}_`, // there's actually no valid underline in Markdown, but *shrug*
+                'strike': text => `~~${text}~~`,
+                'code': text => `\`${text}\``,
+                'blockquote': text => text.split('\n').map(line => `> ${line}\n`).join(''),
                'unordered-list-item': text => text.split('\n').map(line => `- ${line}\n`).join(''),
                'ordered-list-item': text => text.split('\n').map((line, i) => `${i+1}. ${line}\n`).join(''),
            }[command];
@ -462,8 +462,9 @@ export default class MessageComposerInput extends React.Component {
            }
        }

-        if (newState == null)
+        if (newState == null) {
            newState = RichUtils.handleKeyCommand(this.state.editorState, command);
+        }

        if (newState != null) {
            this.setEditorState(newState);
@ -665,7 +666,7 @@ export default class MessageComposerInput extends React.Component {

        const blockName = {
            'code-block': 'code',
-            blockquote: 'quote',
+            'blockquote': 'quote',
            'unordered-list-item': 'bullet',
            'ordered-list-item': 'numbullet',
        };
@ -740,7 +741,7 @@ export default class MessageComposerInput extends React.Component {
            </div>
        );
    }
-};
+}

 MessageComposerInput.propTypes = {
    tabComplete: React.PropTypes.any,
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@ -192,7 +192,7 @@ module.exports = React.createClass({
        }
    },

-    onKeyDown: function (ev) {
+    onKeyDown: function(ev) {
        if (ev.keyCode === KeyCode.ENTER && !ev.shiftKey) {
            var input = this.refs.textarea.value;
            if (input.length === 0) {
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@ -71,7 +71,7 @@ module.exports = React.createClass({
    getDefaultProps: function() {
        return {
            leftOffset: 0,
-        }
+        };
    },

    getInitialState: function() {
@ -81,7 +81,7 @@ module.exports = React.createClass({
        // position.
        return {
            suppressDisplay: !this.props.suppressAnimation,
-        }
+        };
    },

    componentWillUnmount: function() {
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@ -182,8 +182,8 @@ module.exports = React.createClass({
                'm.room.name', user_id
            );

-            save_button = <div className="mx_RoomHeader_textButton" onClick={this.props.onSaveClick}>Save</div>
-            cancel_button = <div className="mx_RoomHeader_cancelButton" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" alt="Cancel"/> </div>
+            save_button = <div className="mx_RoomHeader_textButton" onClick={this.props.onSaveClick}>Save</div>;
+            cancel_button = <div className="mx_RoomHeader_cancelButton" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" alt="Cancel"/> </div>;
        }

        if (this.props.saving) {
@ -193,7 +193,7 @@ module.exports = React.createClass({

        if (can_set_room_name) {
            var RoomNameEditor = sdk.getComponent("rooms.RoomNameEditor");
-            name = <RoomNameEditor ref="nameEditor" room={this.props.room} />
+            name = <RoomNameEditor ref="nameEditor" room={this.props.room} />;
        }
        else {
            var searchStatus;
@ -232,7 +232,7 @@ module.exports = React.createClass({

        if (can_set_room_topic) {
            var RoomTopicEditor = sdk.getComponent("rooms.RoomTopicEditor");
-            topic_el = <RoomTopicEditor ref="topicEditor" room={this.props.room} />
+            topic_el = <RoomTopicEditor ref="topicEditor" room={this.props.room} />;
        } else {
            var topic;
            if (this.props.room) {
@ -301,7 +301,7 @@ module.exports = React.createClass({
            rightPanel_buttons =
                <div className="mx_RoomHeader_button" onClick={this.onShowRhsClick} title="<">
                    <TintableSvg src="img/minimise.svg" width="10" height="16"/>
-                </div>
+                </div>;
        }

        var right_row;
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@ -46,7 +46,7 @@ module.exports = React.createClass({
            isLoadingLeftRooms: false,
            lists: {},
            incomingCall: null,
-        }
+        };
    },

    componentWillMount: function() {
@ -338,7 +338,7 @@ module.exports = React.createClass({
            // as this is used to calculate the CSS fixed top position for the stickies
            var scrollAreaHeight = ReactDOM.findDOMNode(this).getBoundingClientRect().height;

-            var top = (incomingCallBox.parentElement.getBoundingClientRect().top + window.pageYOffset)
+            var top = (incomingCallBox.parentElement.getBoundingClientRect().top + window.pageYOffset);
            // Make sure we don't go too far up, if the headers aren't sticky
            top = (top < scrollAreaOffset) ? scrollAreaOffset : top;
            // make sure we don't go too far down, if the headers aren't sticky
@ -401,7 +401,7 @@ module.exports = React.createClass({
            var stickyHeight = sticky.dataset.originalHeight;
            var stickyHeader = sticky.childNodes[0];
            var topStuckHeight = stickyHeight * i;
-            var bottomStuckHeight = stickyHeight * (stickyWrappers.length - i)
+            var bottomStuckHeight = stickyHeight * (stickyWrappers.length - i);

            if (self.scrollAreaSufficient && stickyPosition < (scrollArea.scrollTop + topStuckHeight)) {
                // Top stickies
@ -520,7 +520,7 @@ module.exports = React.createClass({
                             collapsed={ self.props.collapsed }
                             searchFilter={ self.props.searchFilter }
                             onHeaderClick={ self.onSubListHeaderClick }
-                             onShowMoreRooms={ self.onShowMoreRooms } />
+                             onShowMoreRooms={ self.onShowMoreRooms } />;

                    }
                }) }
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@ -58,7 +58,7 @@ module.exports = React.createClass({
    getInitialState: function() {
        return {
            busy: false
-        }
+        };
    },

    componentWillMount: function() {
@ -96,7 +96,7 @@ module.exports = React.createClass({
                    emailMatchBlock = <div className="error">
                        Unable to ascertain that the address this invite was
                        sent to matches one associated with your account.
-                    </div>
+                    </div>;
                } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {
                    emailMatchBlock =
                        <div className="mx_RoomPreviewBar_warning">
@ -107,7 +107,7 @@ module.exports = React.createClass({
                                This invitation was sent to <b><span className="email">{this.props.invitedEmail}</span></b>, which is not associated with this account.<br/>
                                You may wish to login with a different account, or add this email to this account.
                            </div>
-                        </div>
+                        </div>;
                }
            }
            joinBlock = (
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@ -252,7 +252,7 @@ module.exports = React.createClass({
        return this.refs.url_preview_settings.saveSettings();
    },

-    saveEncryption: function () {
+    saveEncryption: function() {
        if (!this.refs.encrypt) { return q(); }

        var encrypt = this.refs.encrypt.checked;
@ -404,7 +404,7 @@ module.exports = React.createClass({
        var cli = MatrixClientPeg.get();
        var roomState = this.props.room.currentState;
        return (roomState.mayClientSendStateEvent("m.room.join_rules", cli) &&
-                roomState.mayClientSendStateEvent("m.room.guest_access", cli))
+                roomState.mayClientSendStateEvent("m.room.guest_access", cli));
    },

    onManageIntegrations(ev) {
@ -510,7 +510,7 @@ module.exports = React.createClass({
        var UrlPreviewSettings = sdk.getComponent("room_settings.UrlPreviewSettings");
        var EditableText = sdk.getComponent('elements.EditableText');
        var PowerSelector = sdk.getComponent('elements.PowerSelector');
-        var Loader = sdk.getComponent("elements.Spinner")
+        var Loader = sdk.getComponent("elements.Spinner");

        var cli = MatrixClientPeg.get();
        var roomState = this.props.room.currentState;
@ -557,7 +557,7 @@ module.exports = React.createClass({
                </div>;
        }
        else {
-            userLevelsSection = <div>No users have specific privileges in this room.</div>
+            userLevelsSection = <div>No users have specific privileges in this room.</div>;
        }

        var banned = this.props.room.getMembersWithMembership("ban");
@ -635,7 +635,7 @@ module.exports = React.createClass({
                                    </label>);
                        })) : (self.state.tags && self.state.tags.join) ? self.state.tags.join(", ") : ""
                    }
-                </div>
+                </div>;
        }

        // If there is no history_visibility, it is assumed to be 'shared'.
@ -653,7 +653,7 @@ module.exports = React.createClass({
            addressWarning =
                <div className="mx_RoomSettings_warning">
                    To link to a room it must have <a href="#addresses">an address</a>.
-                </div>
+                </div>;
        }

        var inviteGuestWarning;
@ -664,7 +664,7 @@ module.exports = React.createClass({
                        this.setState({ join_rule: "invite", guest_access: "can_join" });
                        e.preventDefault();
                    }}>Click here to fix</a>.
-                </div>
+                </div>;
        }

        var integrationsButton;
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@ -221,7 +221,7 @@ module.exports = React.createClass({
        var avatarContainerClasses = classNames({
            'mx_RoomTile_avatar_container': true,
            'mx_RoomTile_avatar_roomTagMenu': this.state.roomTagMenu,
-        })
+        });

        var badgeClasses = classNames({
            'mx_RoomTile_badge': true,
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@ -118,7 +118,7 @@ var SearchableEntityList = React.createClass({
    _createOverflowEntity: function(overflowCount, totalCount) {
        var EntityTile = sdk.getComponent("rooms.EntityTile");
        var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        var text = "and " + overflowCount + " other" + (overflowCount > 1 ? "s" : "") +  "...";
+        var text = "and " + overflowCount + " other" + (overflowCount > 1 ? "s" : "") + "...";
        return (
            <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
                <BaseAvatar url="img/ellipsis.svg" name="..." width={36} height={36} />
@ -135,8 +135,8 @@ var SearchableEntityList = React.createClass({
                <form onSubmit={this.onQuerySubmit} autoComplete="off">
                    <input className="mx_SearchableEntityList_query" id="mx_SearchableEntityList_query" type="text"
                        onChange={this.onQueryChanged} value={this.state.query}
-                        onFocus= {() => { this.setState({ focused: true }) }}
-                        onBlur= {() => { this.setState({ focused: false }) }}
+                        onFocus= {() => { this.setState({ focused: true }); }}
+                        onBlur= {() => { this.setState({ focused: false }); }}
                        placeholder={this.props.searchPlaceholderText} />
                </form>
            );
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@ -44,7 +44,7 @@ module.exports = React.createClass({

        var cancelButton;
        if (this.props.onCancelClick) {
-            cancelButton = <div className="mx_RoomHeader_cancelButton" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" alt="Cancel"/> </div>
+            cancelButton = <div className="mx_RoomHeader_cancelButton" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" alt="Cancel"/> </div>;
        }

        var showRhsButton;
--- a/src/components/views/rooms/UserTile.js
+++ b/src/components/views/rooms/UserTile.js
@ -38,7 +38,7 @@ module.exports = React.createClass({
        var active = -1;

        // FIXME: make presence data update whenever User.presence changes...
-        active = user.lastActiveAgo ? 
+        active = user.lastActiveAgo ?
            (Date.now() - (user.lastPresenceTs - user.lastActiveAgo)) : -1;

        var BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@ -49,7 +49,7 @@ module.exports = React.createClass({
        return {
            avatarUrl: this.props.initialAvatarUrl,
            phase: this.Phases.Display,
-        }
+        };
    },

    componentWillReceiveProps: function(newProps) {
@ -120,7 +120,7 @@ module.exports = React.createClass({
            var 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;
@ -130,7 +130,7 @@ module.exports = React.createClass({
                    Upload new:
                    <input type="file" onChange={this.onFileSelected}/>
                    {this.state.errorText}
-                </div>  
+                </div>
            );
        }

--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@ -59,7 +59,7 @@ module.exports = React.createClass({
    getInitialState: function() {
        return {
            phase: this.Phases.Edit
-        }
+        };
    },

    changePassword: function(old_password, new_password) {
@ -105,7 +105,7 @@ module.exports = React.createClass({
    render: function() {
        var rowClassName = this.props.rowClassName;
        var rowLabelClassName = this.props.rowLabelClassName;
-        var rowInputClassName = this.props.rowInputClassName
+        var rowInputClassName = this.props.rowInputClassName;
        var buttonClassName = this.props.buttonClassName;

        switch (this.state.phase) {
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@ -88,7 +88,7 @@ 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 };
        });
@ -98,7 +98,7 @@ export default class DevicesPanel extends React.Component {
        var DevicesPanelEntry = sdk.getComponent('settings.DevicesPanelEntry');
        return (
            <DevicesPanelEntry key={device.device_id} device={device}
-               onDeleted={()=>{this._onDeviceDeleted(device)}} />
+               onDeleted={()=>{this._onDeviceDeleted(device);}} />
        );
    }

--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@ -15,12 +15,9 @@ limitations under the License.
 */

 import React from 'react';
-import classNames from 'classnames';
-import q from 'q';

 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import DateUtils from '../../../DateUtils';
 import Modal from '../../../Modal';

 export default class DevicesPanelEntry extends React.Component {
@ -61,7 +58,7 @@ export default class DevicesPanelEntry extends React.Component {
            if (this._unmounted) { return; }
            if (error.httpStatus !== 401 || !error.data || !error.data.flows) {
                // doesn't look like an interactive-auth failure
-                throw e;
+                throw error;
            }

            // pop up an interactive auth dialog
@ -121,7 +118,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"
--- a/src/components/views/settings/EnableNotificationsButton.js
+++ b/src/components/views/settings/EnableNotificationsButton.js
@ -17,7 +17,6 @@ limitations under the License.
 'use strict';
 var React = require("react");
 var Notifier = require("../../../Notifier");
-var sdk = require('../../../index');
 var dis = require("../../../dispatcher");

 module.exports = React.createClass({
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@ -124,7 +124,7 @@ module.exports = React.createClass({
        return this.refs.video;
    },

-    render: function(){
+    render: function() {
        var VideoView = sdk.getComponent('voip.VideoView');

        var voice;
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@ -114,7 +114,7 @@ module.exports = React.createClass({
                    <VideoFeed ref="remote" onResize={this.props.onResize}
                        maxHeight={maxVideoHeight} />
                </div>
-                <div className="mx_VideoView_localVideoFeed">                
+                <div className="mx_VideoView_localVideoFeed">
                    <VideoFeed ref="local"/>
                </div>
            </div>