diff --git a/dot-nylas/config.cson b/dot-nylas/config.cson index d3f683b7e..34c243b57 100644 --- a/dot-nylas/config.cson +++ b/dot-nylas/config.cson @@ -4,7 +4,6 @@ 'ui-light' ] 'disabledPackages': [ - "calendar-bar", - "salesforce" + "calendar-bar" ] 'updateLevel': 'patch' diff --git a/internal_packages/onboarding/lib/connect-account-page.cjsx b/internal_packages/onboarding/lib/connect-account-page.cjsx index 9fa8dcc77..7556efb28 100644 --- a/internal_packages/onboarding/lib/connect-account-page.cjsx +++ b/internal_packages/onboarding/lib/connect-account-page.cjsx @@ -19,7 +19,7 @@ class ConnectAccountPage extends Page
Link accounts from other services to supercharge your email.
- +

No more external accounts to link. Add additional features with plugins to Nylas Mail.

diff --git a/spec-nylas/components/form-builder-spec.cjsx b/spec-nylas/components/form-builder-spec.cjsx deleted file mode 100644 index 621005a1c..000000000 --- a/spec-nylas/components/form-builder-spec.cjsx +++ /dev/null @@ -1,40 +0,0 @@ -fs = require 'fs' -path = require 'path' -React = require ('react/addons') -ReactTestUtils = React.addons.TestUtils -{FormItem, - GeneratedForm, - GeneratedFieldset} = require ('../../src/components/generated-form') - -fixtureModule = path.resolve(__dirname, '..', '..', 'internal_packages', 'salesforce') -Adapter = require(path.join(fixtureModule, 'lib/salesforce-schema-adapter')) -fpath = path.join(fixtureModule, 'spec/fixtures/opportunity-layouts.json') -rawData = JSON.parse(fs.readFileSync(fpath, 'utf-8')) -testData = Adapter.convertFullEditLayout("opportunity", rawData) - -describe "Form Builder", -> - beforeEach -> - for fieldset in testData.fieldsets - for formItem in fieldset.formItems - if formItem.type is "reference" - formItem.type = React.createClass(render: ->
) - - @form = ReactTestUtils.renderIntoDocument( - } onChange={->}> - ) - - it "generates a form", -> - forms = ReactTestUtils.scryRenderedComponentsWithType(@form, GeneratedForm) - $forms = ReactTestUtils.scryRenderedDOMComponentsWithTag(@form, "form") - expect(forms.length).toBeGreaterThan 0 - expect($forms.length).toBeGreaterThan 0 - - it "generates a fieldset", -> - fieldsets = ReactTestUtils.scryRenderedComponentsWithType(@form, GeneratedFieldset) - $fieldsets = ReactTestUtils.scryRenderedDOMComponentsWithTag(@form, "fieldset") - expect(fieldsets.length).toBeGreaterThan 0 - expect($fieldsets.length).toBeGreaterThan 0 - - it "generates a form item", -> - items = ReactTestUtils.scryRenderedComponentsWithType(@form, FormItem) - expect(items.length).toBeGreaterThan 0 diff --git a/src/components/tokenizing-text-field.cjsx b/src/components/tokenizing-text-field.cjsx index b31dca72d..bb960d129 100644 --- a/src/components/tokenizing-text-field.cjsx +++ b/src/components/tokenizing-text-field.cjsx @@ -151,11 +151,10 @@ class TokenizingTextField extends React.Component @propTypes: # An array of current tokens. # - # A token is usually an object type like a - # `Contact` or a `SalesforceObject`. The set of tokens is stored as a - # prop instead of `state`. This means that when the set of tokens - # needs to be changed, it is the parent's responsibility to make that - # change. + # A token is usually an object type like a `Contact`. The set of + # tokens is stored as a prop instead of `state`. This means that when + # the set of tokens needs to be changed, it is the parent's + # responsibility to make that change. tokens: React.PropTypes.arrayOf(React.PropTypes.object) # The maximum number of tokens allowed. When null (the default) and diff --git a/src/flux/models/contact.coffee b/src/flux/models/contact.coffee index 2941e2961..ad1d81ece 100644 --- a/src/flux/models/contact.coffee +++ b/src/flux/models/contact.coffee @@ -21,9 +21,9 @@ For more information about Contacts on the Nylas Platform, read the `email`: {AttributeString} The email address of the contact. Queryable. `thirdPartyData`: {AttributeObject} Extra data that we find out about a -contact. The data is keyed by the service that dumped the data there e.g. -"salesforce" or "fullcontact". The value is an object of raw data in the -form that the service provides +contact. The data is keyed by the 3rd party service that dumped the data +there. The value is an object of raw data in the form that the service +provides We also have "normalized" optional data for each contact. This list may grow as the needs of a contact become more complex. diff --git a/src/flux/stores/metadata-store.coffee b/src/flux/stores/metadata-store.coffee index 075071b27..2a937b541 100644 --- a/src/flux/stores/metadata-store.coffee +++ b/src/flux/stores/metadata-store.coffee @@ -13,11 +13,9 @@ AccountStore = require '../stores/account-store' CreateMetadataTask = require '../tasks/create-metadata-task' DestroyMetadataTask = require '../tasks/destroy-metadata-task' -# TODO: This Store is like many other stores (like the -# SalesforceObjectStore or the SalesforceThreadAssociationStore) in that it has -# to double cache data from the API and the DB with minor variation. -# There's a task to refactor these stores into something like an -# `APIBackedStore` to abstract some of the complex logic out. +# TODO: This Store has to double cache data from the API and the DB with +# minor variation. There's a task to refactor these stores into something +# like an `APIBackedStore` to abstract some of the complex logic out. MAX_API_RATE = 1000 diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less index 444383fc4..c3b065b32 100644 --- a/static/variables/ui-variables.less +++ b/static/variables/ui-variables.less @@ -12,7 +12,7 @@ // 3. Generic font descriptor mixins (.bold, .italic, .h1, .h2) // -------- // 4. Generic usage descriptor (.btn-text, .p-body) -// 5. Application-specific usage (.message-list-h1, .salesforce-h1) +// 5. Application-specific usage (.message-list-h1) //=============================== Colors ===============================// //== Brand colors