Skip to content

Commit

Permalink
Fix eslint / prettier lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
bengotow committed Oct 20, 2017
1 parent 3e2b17e commit 9448c88
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,16 @@ Features:

- Mailspring now warns you if you the salutation in your email ("Hey Ben!") doesn't match the name of a recipient or appears misspelled.

- A new keyboard shortcut allows you to attach a file in the composer. (Ctrl-Shift-A by default!)

Fixes:

- The contact sidebar now loads correctly if you switch to a contact with no name.

- On Windows, Mailspring no longer needs to be restarted once before you can link a Gmail account.

- When replying to a message you sent in a thread, Mailspring no longer incorrectly addresses the new message to yourself.

- Mail rules now run correctly as new mail is received.

- The label picker is now correctly hidden if your selection includes threads from non-Gmail accounts.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ export default class SidebarParticipantPicker extends React.Component {
_onSelectContact = event => {
const { sortedContacts } = this.state;
const [email, name] = event.target.value.split(SPLIT_KEY);
const contact = sortedContacts.find(c => (c.name === name || typeof c.name == "undefined" ) && c.email === email);
const contact = sortedContacts.find(
c => (c.name === name || typeof c.name === 'undefined') && c.email === email
);
return Actions.focusContact(contact);
};

Expand Down
1 change: 0 additions & 1 deletion app/src/flux/stores/draft-helpers.es6
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Message from '../models/message';
import * as ExtensionRegistry from '../../registries/extension-registry';
import DOMUtils from '../../dom-utils';

import QuotedHTMLTransformer from '../../services/quoted-html-transformer';
import InlineStyleTransformer from '../../services/inline-style-transformer';
import SanitizeTransformer from '../../services/sanitize-transformer';
import MessageUtils from '../models/message-utils';
Expand Down
2 changes: 0 additions & 2 deletions app/src/mail-rules-templates.es6
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import MailspringObservables from 'mailspring-observables';
import Label from './flux/models/label';
import CategoryStore from './flux/stores/category-store';
import { Template } from './components/scenario-editor-models';

export const ConditionTemplates = [
Expand Down

0 comments on commit 9448c88

Please sign in to comment.