Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelcobain committed Nov 26, 2018
2 parents 3b010d9 + 0413af3 commit 7b33ac5
Show file tree
Hide file tree
Showing 124 changed files with 17,836 additions and 12,084 deletions.
25 changes: 23 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,23 @@
tests/dummy/**/*.js
/blueprints/*/files/**/*.js
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

# snippets
/tests/dummy/snippets/
10 changes: 7 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,21 @@ module.exports = {
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
'plugin:ember/recommended',
'plugin:ember-suave/recommended'
],
env: {
browser: true
},
rules: {
'ember-suave/require-access-in-comments': 'off',
'ember/closure-actions': 'off'
'ember-suave/require-access-in-comments': 'off'
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
Expand All @@ -47,6 +49,8 @@ module.exports = {
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
'ember-suave/prefer-destructuring': 'off',
'camelcase': 'off'
})
}
]
Expand Down
23 changes: 14 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
.idea
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

# editors
/.idea
44 changes: 26 additions & 18 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.eslintignore
/.eslintrc.js
/.gitignore
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.eslintrc.js
.gitignore
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
/ember-cli-build.js
/testem.js
/tests/
/yarn.lock
.gitkeep

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
9 changes: 9 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict';

module.exports = {
extends: 'recommended',
rules: {
'attribute-indentation': false,
'no-inline-styles': false
}
};
54 changes: 30 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,52 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "8"
- "6"

sudo: required
sudo: false
dist: trusty

addons:
chrome: stable

cache:
yarn: true
directories:
- $HOME/.npm

env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1
matrix:

jobs:
fail_fast: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
script:
- npm run lint:hbs
- npm run lint:js
- npm test

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-lts-2.16
- EMBER_TRY_SCENARIO=ember-lts-2.18
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default

matrix:
fast_finish: true
allow_failures:
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install:
- yarn install --no-lockfile --non-interactive
- npm config set spin false
- npm install -g npm@4
- npm --version

script:
- yarn lint:js
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
- [#794](https://github.com/miguelcobain/ember-paper/pull/794) forward primary/warn arguments to the toasts' paper-button.
- [dd7979e](https://github.com/miguelcobain/ember-paper/commit/dd7979ec08a94be6470aa355c6da12db5b2ec20b) correctly escape paper-autocomplete-highlight output (fixes [#985](https://github.com/miguelcobain/ember-paper/issues/985)).
- [#997](https://github.com/miguelcobain/ember-paper/pull/997) remove autoprefixer. *Users should install ember-cli-autoprefixer on their apps from now on.* This makes autoprefixer to run according to your target browsers in your project.
- This ember-paper version no longer relies on jQuery. Credits to @betocantu93 for the inumerous PRs to refactor this.
- [#1024](https://github.com/miguelcobain/ember-paper/pull/1024) Associate input field with corresponding info messages for better a11y
- [#1026](https://github.com/miguelcobain/ember-paper/pull/1026) support `aria-hidden` argument on paper-icon
- [#588](https://github.com/miguelcobain/ember-paper/pull/588) Allow paper-autocomplete to be blockless

### 1.0.0-beta.18
- [68ca72e](https://github.com/miguelcobain/ember-paper/commit/d931d1918e9ddd208cecf045bb6378b39148d7d1) not using ember-cli-sass-variables-export addon anymore since it doesn't output the generated files when using `ember build` (just `ember s`). We're manually including the generated files until we find a better solution. The palettes aren't likely to change anyway.
Expand Down
69 changes: 0 additions & 69 deletions CONTRIBUTING.md

This file was deleted.

8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,15 @@ Navigate through the docs to understand how to use each component.

## Resources

- The team can often be found on the [#e-paper channel on discord](https://discord.gg/zT3asNS). Features and designs are discussed there prior to implementation.
- Contributors can often be found on the [#e-paper channel on discord](https://discord.gg/zT3asNS).

- The [GitHub milestone issue](https://github.com/miguelcobain/ember-paper/issues/249) tracks our progress to version 1.0.

- Building the `ember-paper` demo application will give you your own up-to-date reference. This can be accomplished by installing ember-paper as if it were an application and running `ember server`.

- **Ready to help?** Read our [Contributing Guide](CONTRIBUTING.md).
- Building the `ember-paper` demo application will give you your own up-to-date reference. This can be accomplished by cloning ember-paper as if it were an application and running `ember server`.

## Contributing

This is a very ambitious project. Google's design specs are extensive, and non-trivial to implement. If you can port or fix a component or two, please drop a pull request or issue on GitHub or join us on Discord.
This is an ambitious project. Google's design specs are extensive, and non-trivial to implement. If you can port or fix a component or two, please drop a pull request or issue on GitHub or join us on Discord.

With everyone's help, we can bring this amazing design spec to Ember in a modular and elegant way. The Ember way.

Expand Down
4 changes: 0 additions & 4 deletions addon/components/paper-autocomplete.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/**
* @module ember-paper
*/
import { inject as service } from '@ember/service';

import { alias } from '@ember/object/computed';
import { assert } from '@ember/debug';
import { isNone } from '@ember/utils';
Expand All @@ -22,8 +20,6 @@ export default PowerSelect.extend(ValidationMixin, ChildMixin, {
layout,
calculatePosition,

util: service(),
constants: service(),
triggerComponent: 'paper-autocomplete-trigger',
contentComponent: 'paper-autocomplete-content',
optionsComponent: 'paper-autocomplete-options',
Expand Down
4 changes: 2 additions & 2 deletions addon/components/paper-checkbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default Component.extend(FocusableMixin, RippleMixin, ColorMixin, Proxiab

click() {
if (!this.get('disabled')) {
invokeAction(this, 'onChange', !this.get('value'))
invokeAction(this, 'onChange', !this.get('value'));
}
// Prevent bubbling, if specified. If undefined, the event will bubble.
return this.get('bubbles');
Expand All @@ -63,6 +63,6 @@ export default Component.extend(FocusableMixin, RippleMixin, ColorMixin, Proxiab
},

processProxy() {
invokeAction(this, 'onChange', !this.get('value'))
invokeAction(this, 'onChange', !this.get('value'));
}
});
Loading

0 comments on commit 7b33ac5

Please sign in to comment.