Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Defined ember-cli-eslint with default #40

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'airbnb-base',
extends: 'eslint:recommended',
env: {
'es6': true,
'browser': true,
'node': true
browser: true
},
rules: {
'arrow-parens': [2, 'always'],
'func-names': 0,
'no-use-before-define': [2, 'nofunc'],
'prefer-arrow-callback': 0,
'import/no-unresolved': 0,
'import/extensions': 0,
'no-restricted-syntax': 0,
"import/no-extraneous-dependencies": 0,
'no-underscore-dangle': 0,
'no-param-reassign': [2, { "props": false }]
}
};
32 changes: 0 additions & 32 deletions .jshintrc

This file was deleted.

4 changes: 2 additions & 2 deletions addon/components/split-child.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default Ember.Component.extend({
classNameBindings: [
'parent.isDragging:dragging',
'parent.isVertical:vertical:horizontal',
'childSplitView:nested',
'childSplitView:nested'
],

childSplitView: null,
Expand Down Expand Up @@ -174,6 +174,6 @@ export default Ember.Component.extend({

return this.minSizeHorizontal();
}
),
)

});
2 changes: 1 addition & 1 deletion addon/components/split-sash.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ export default Ember.Component.extend({
mouseDown(event) {
this.set('parent.isDragging', true);
event.preventDefault();
},
}

});
32 changes: 15 additions & 17 deletions addon/components/split-view.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint max-len: 0 */
/* eslint new-cap: ["error", { "capIsNew": false }]*/
import Ember from 'ember';
import SplitChild from './split-child';
import splitViewLayout from 'ember-split-view/templates/components/split-view';
Expand All @@ -16,28 +14,28 @@ const { computed, observer } = Ember;
* Vertical SplitView example:
*
* ```handlebars
* {{#split-view isVertical=true}}
* {{#split-child}}
* {{#split-view isVertical=true as |split| }}
* {{#split.child}}
* Content of the left view here.
* {{/split-child}}
* {{split-sash"}}
* {{#split-child}}
* {{/split.child}}
* {{split.sash}}
* {{#split.child}}
* Content of the right view here.
* {{/split-child}}
* {{/split.child}}
* {{/split-view}}
* ```
*
* Horizontal SplitView example:
*
* ```handlebars
* {{#split-view isVertical=false}}
* {{#split-child}}
* Content of the top view here.
* {{/split-child}}
* {{split-sash"}}
* {{#split-child}}
* Content of the bottom view here.
* {{/split-child}}
* {{#split-view isVertical=false as |split| }}
* {{#split.child}}
* Content of the left view here.
* {{/split.child}}
* {{split.sash}}
* {{#split.child}}
* Content of the right view here.
* {{/split.child}}
* {{/split-view}}
* ```
*
Expand Down Expand Up @@ -234,6 +232,6 @@ export default Ember.Component.extend({

this.set('splitPosition', position);
this.constrainSplit();
},
}

});
2 changes: 1 addition & 1 deletion addon/templates/components/split-view.hbs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{yield (hash child=(component 'split-child' parent=this) sash=(component 'split-sash' parent=this) ) }}
{{yield (hash child=(component "split-child" parent=this) sash=(component "split-sash" parent=this) ) }}
Empty file removed app/styles/app.scss
Empty file.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* jshint node: true */
/* globals module */
'use strict';

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"ember-cli": "2.10.0",
"ember-cli-app-version": "^2.0.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "4.2.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jshint": "^2.0.1",
"ember-cli-qunit": "^3.0.1",
"ember-cli-release": "^0.2.9",
"ember-cli-sri": "^2.1.0",
Expand Down
5 changes: 5 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
env: {
embertest: true
}
};
52 changes: 0 additions & 52 deletions tests/.jshintrc

This file was deleted.

32 changes: 0 additions & 32 deletions tests/dummy/.jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion tests/dummy/app/controllers/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ export default Ember.Controller.extend({
Ember.Object.create({ title: "Vertical Composite", content: 'verticalComposite'}),
Ember.Object.create({ title: "Horizontal Composite", content: 'horizontalComposite'}),
Ember.Object.create({ title: "Composite", content: 'composite'}),
Ember.Object.create({ title: "Collapsible Panes", content: 'collapsiblePanes'}),
Ember.Object.create({ title: "Collapsible Panes", content: 'collapsiblePanes'})
])
});