Skip to content

Commit f87a939

Browse files
authored
Merge pull request #40 from Alonski/master
Updated Addon to Ember v2.18.2
2 parents 851153a + 2052484 commit f87a939

39 files changed

+7583
-306
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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+
'tests/dummy/app/**'
33+
],
34+
parserOptions: {
35+
sourceType: 'script',
36+
ecmaVersion: 2015
37+
},
38+
env: {
39+
browser: false,
40+
node: true
41+
},
42+
plugins: ['node'],
43+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
44+
// add your custom rules and overrides for node files here
45+
})
46+
},
47+
48+
// test files
49+
{
50+
files: ['tests/**/*.js'],
51+
excludedFiles: ['tests/dummy/**/*.js'],
52+
env: {
53+
embertest: true
54+
}
55+
}
56+
]
57+
};

.gitignore

Lines changed: 8 additions & 2 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,5 +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
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

.jshintrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

.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

.travis.yml

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
11
---
22
language: node_js
33
node_js:
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
46
- "4"
57

68
sudo: false
9+
dist: trusty
10+
11+
addons:
12+
chrome: stable
713

814
cache:
915
directories:
10-
- node_modules
16+
- $HOME/.npm
1117

1218
env:
13-
- EMBER_TRY_SCENARIO=default
14-
- EMBER_TRY_SCENARIO=ember-release
15-
- EMBER_TRY_SCENARIO=ember-beta
16-
- EMBER_TRY_SCENARIO=ember-canary
19+
global:
20+
# See https://git.io/vdao3 for details.
21+
- JOBS=1
22+
matrix:
23+
# we recommend new addons test the current and previous LTS
24+
# as well as latest stable release (bonus points to beta/canary)
25+
- EMBER_TRY_SCENARIO=ember-lts-2.12
26+
- EMBER_TRY_SCENARIO=ember-lts-2.16
27+
- EMBER_TRY_SCENARIO=ember-release
28+
- EMBER_TRY_SCENARIO=ember-beta
29+
- EMBER_TRY_SCENARIO=ember-canary
30+
- EMBER_TRY_SCENARIO=ember-default
1731

1832
matrix:
1933
fast_finish: true
@@ -23,16 +37,11 @@ matrix:
2337

2438
before_install:
2539
- npm config set spin false
26-
- npm install -g bower
27-
- bower --version
28-
- npm install phantomjs-prebuilt
29-
- phantomjs --version
30-
31-
install:
32-
- npm install
33-
- bower install
40+
- npm install -g npm@4
41+
- npm --version
3442

3543
script:
44+
- npm run lint:js
3645
# Usually, it's ok to finish the test scenario without reverting
3746
# to the addon's original dependency state, skipping "cleanup".
38-
- ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
47+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016
3+
Copyright (c) 2018
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

addon/components/cp-panel-body/component.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22
import layout from './template';
33

4-
export default Ember.Component.extend({
4+
export default Component.extend({
55
layout,
66

77
classNames: ['cp-Panel-body'],

addon/components/cp-panel-toggle/component.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22

3-
export default Ember.Component.extend({
3+
export default Component.extend({
44

55
tagName: 'a',
66
classNames: ['cp-Panel-toggle'],

addon/components/cp-panel/component.js

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
1-
import Ember from 'ember';
1+
import { scheduleOnce } from '@ember/runloop';
2+
import { computed } from '@ember/object';
3+
import { and, oneWay, readOnly, not } from '@ember/object/computed';
4+
import { inject as service } from '@ember/service';
5+
import Component from '@ember/component';
26
import layout from './template';
37

4-
export default Ember.Component.extend({
8+
export default Component.extend({
59
layout,
610

7-
panelActions: Ember.inject.service(),
8-
dependencyChecker: Ember.inject.service(),
9-
shouldAnimate: Ember.computed.and('dependencyChecker.hasLiquidFire', 'animate'),
11+
panelActions: service(),
12+
dependencyChecker: service(),
13+
shouldAnimate: and('dependencyChecker.hasLiquidFire', 'animate'),
1014

1115
group: null, // passed in if rendered as part of a {{cp-panels}} group
1216

1317
classNames: ['cp-Panel'],
1418
classNameBindings: ['isOpen:cp-is-open:cp-is-closed'],
1519

1620
// Caller can overwrite
17-
name: Ember.computed.oneWay('elementId'),
21+
name: oneWay('elementId'),
1822

19-
panelState: Ember.computed('name', function() {
23+
panelState: computed('name', function() {
2024
const name = this.get('name');
2125
// debugger;
2226
return this.get(`panelActions.state.${name}`);
2327
}),
2428

25-
isOpen: Ember.computed.readOnly('panelState.isOpen'),
26-
isClosed: Ember.computed.not('isOpen'),
29+
isOpen: readOnly('panelState.isOpen'),
30+
isClosed: not('isOpen'),
2731

2832
panelsWrapper: null,
2933
animate: true,
@@ -38,15 +42,16 @@ export default Ember.Component.extend({
3842
},
3943

4044
// Register with parent panels component
41-
maybeRegisterWithStateService: Ember.on('didInsertElement', function() {
42-
Ember.run.scheduleOnce('afterRender', () => {
45+
didInsertElement() {
46+
this._super(...arguments);
47+
scheduleOnce('afterRender', () => {
4348
let group = this.get('group');
4449

4550
if (group) {
4651
this.get('panelState').set('group', group);
4752
}
4853
});
49-
}),
54+
},
5055

5156
actions: {
5257
toggleIsOpen() {

0 commit comments

Comments
 (0)