Skip to content

Commit aede9c8

Browse files
shen6653shen6653
authored
Merge branch 'master' into patch-1
2 parents 003c05f + 5ef02f0 commit aede9c8

41 files changed

Lines changed: 13453 additions & 330 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,8 @@ insert_final_newline = true
1313
indent_style = space
1414
indent_size = 2
1515

16-
[*.js]
17-
indent_style = space
18-
indent_size = 2
19-
2016
[*.hbs]
2117
insert_final_newline = false
22-
indent_style = space
23-
indent_size = 2
24-
25-
[*.css]
26-
indent_style = space
27-
indent_size = 2
28-
29-
[*.html]
30-
indent_style = space
31-
indent_size = 2
3218

3319
[*.{diff,md}]
3420
trim_trailing_whitespace = false

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/tests/dummy/public/js/materialize.js

‎.eslintrc.js‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 2017,
5+
sourceType: 'module'
6+
},
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
14+
env: {
15+
browser: true
16+
},
17+
rules: {
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'index.js',
24+
'testem.js',
25+
'ember-cli-build.js',
26+
'config/**/*.js',
27+
'tests/dummy/config/**/*.js'
28+
],
29+
excludedFiles: [
30+
'app/**',
31+
'addon/**'
32+
],
33+
parserOptions: {
34+
sourceType: 'script',
35+
ecmaVersion: 2015
36+
},
37+
env: {
38+
browser: false,
39+
node: true
40+
},
41+
plugins: ['node'],
42+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
43+
// add your custom rules and overrides for node files here
44+
})
45+
},
46+
47+
// test files
48+
{
49+
files: ['tests/**/*.js'],
50+
excludedFiles: ['tests/dummy/**/*.js'],
51+
env: {
52+
embertest: true
53+
}
54+
}
55+
]
56+
};

‎.gitignore‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
44
/dist
@@ -13,6 +13,11 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
npm-debug.log*
17+
yarn-error.log
1718
testem.log
18-
*.sublime-workspace
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

‎.npmignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
.bowerrc
88
.editorconfig
99
.ember-cli
10+
.eslintrc.js
1011
.gitignore
11-
.jshintrc
1212
.watchmanconfig
1313
.travis.yml
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
17+
18+
# ember-try
19+
.node_modules.ember-try/
20+
bower.json.ember-try
21+
package.json.ember-try

‎.prettierrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"singleQuote": true,
3+
"bracketSpacing": true,
4+
"trailingComma": "none",
5+
"useTabs": false,
6+
"tabWidth": 2,
7+
"printWidth": 120,
8+
"semi": true
9+
}

‎.travis.yml‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
1+
---
12
language: node_js
23
node_js:
3-
- 0.12.2
4+
- "4"
5+
46
sudo: false
7+
dist: trusty
8+
9+
addons:
10+
chrome: stable
11+
512
cache:
613
directories:
7-
- node_modules
14+
- $HOME/.npm
15+
816
env:
17+
global:
18+
# See https://git.io/vdao3 for details.
19+
- JOBS=1
920
matrix:
10-
- EMBER_TRY_SCENARIO=ember-1.10
11-
- EMBER_TRY_SCENARIO=ember-1.11
12-
- EMBER_TRY_SCENARIO=ember-1.12
13-
- EMBER_TRY_SCENARIO=ember-1.13
14-
- EMBER_TRY_SCENARIO=ember-2.0
15-
- EMBER_TRY_SCENARIO=ember-2.1
16-
- EMBER_TRY_SCENARIO=ember-2.2
17-
- EMBER_TRY_SCENARIO=ember-2.3
18-
- EMBER_TRY_SCENARIO=ember-release
19-
- ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
20-
- ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
21+
# we recommend new addons test the current and previous LTS
22+
# as well as latest stable release (bonus points to beta/canary)
23+
- EMBER_TRY_SCENARIO=ember-lts-2.12
24+
- EMBER_TRY_SCENARIO=ember-lts-2.16
25+
- EMBER_TRY_SCENARIO=ember-release
26+
- EMBER_TRY_SCENARIO=ember-beta
27+
- EMBER_TRY_SCENARIO=ember-canary
28+
- EMBER_TRY_SCENARIO=ember-default
2129
global:
2230
secure: mlHPZlkzVu5JpCzFNz+o/+DGyI6K2VLh5fY2zoAjuClRazPJ/04tKo8Fxol5U32jpeI6LXJlsyu+lO914q2L0M6+i7iTU1XFeL9PbSdK8IK1AdHWFiJAlli+7eDpkan3FnSg9Y3yjmYrKcaVimVMDmk0GlSiUBOlyic/gEj5uPguC1ACwzFVkwgOrxzUITLg6qtwgYGyJUY8QJb3baoFtZZrpSFqHvzPl2Wr7AIXAcVldl7S5fQUEsQ8gKEa8ZCbCMWvebNXDf8v7C/OwjJnh9awZDcNE5pPavV3mvftDY9QQEulxhhoXowJR/X+1lMcMzgkNtEcDceoRSTHG4z98ASQjsx6aywsZiGaqZlfCvpgkmruXTjCaVPR5lGd1imP+arrxlN6Kn6m+kKdf9KnmV7UIt+Q4lbDsWkNQXNuLC8Ag6okJSPXI3CghxRC8L/NR7iiapjs4SrImTUu9+eJMal93FTWqjQdTkZYWYD5ncKvOzFOX7w+PkmVAH/R8nnuQ+MZwhqi3TO7ieWGcC59mS7BeNokElXSpGUiR+4YahZMNYM27XV8RHXpik8DBvrlHQGtCpNtmZwmNSKR66Y/QgKdL1FJ7XEc+LqeRqkXXe9mEbcfMY7YzWDK1dc4+lFwRq24yxVX0/d40fe4T5CZ5K6RkHODpyHY15CYorEXT0c=
2331

@@ -27,23 +35,19 @@ matrix:
2735
- env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
2836

2937
before_install:
30-
- mkdir travis-phantomjs
31-
- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
32-
-O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
33-
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
34-
- export PATH=$PWD/travis-phantomjs:$PATH
35-
- npm config set spin false
36-
- npm install -g npm@^2
37-
install:
38-
- npm install -g bower
39-
- npm install
40-
- bower install
41-
# before_script:
42-
# - ember sauce:connect
38+
- npm config set spin false
39+
- npm install -g npm@4
40+
- npm --version
41+
4342
script:
44-
- ember try $EMBER_TRY_SCENARIO test --skip-cleanup
43+
- npm run lint:js
44+
# Usually, it's ok to finish the test scenario without reverting
45+
# to the addon's original dependency state, skipping "cleanup".
46+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
47+
4548
# after_script:
4649
# - ember sauce:disconnect
50+
4751
deploy:
4852
provider: npm
4953
email: michael.l.north@gmail.com

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"javascript.implicitProjectConfig.checkJs": true
3+
}

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Ember-resize
22

3+
[![Greenkeeper badge](https://badges.greenkeeper.io/mike-north/ember-resize.svg)](https://greenkeeper.io/)
4+
35
<img align="right" src="http://i59.tinypic.com/fadijn.png">
46

57
[![Build Status](https://travis-ci.org/mike-north/ember-resize.svg?branch=master)](https://travis-ci.org/mike-north/ember-resize)

‎addon/mixins/resize-aware.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import Ember from 'ember';
2-
3-
const { Mixin } = Ember;
1+
import Mixin from '@ember/object/mixin';
42
const { floor } = Math;
53

64
export default Mixin.create({

0 commit comments

Comments
 (0)