Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
onechiporenko authored Jul 2, 2020
1 parent 9326969 commit 71cb7e8
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 16 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = {
browser: true
},
rules: {
'no-setter-return': 0,
'quotes': [2, 'single'],
'ember/no-observers': 0,
'ember/avoid-leaking-state-in-ember-objects': [2, [
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ node_js:
# so that your addon works for all apps
- "10"

dist: trusty
dist: xenial

addons:
chrome: stable
Expand Down
2 changes: 1 addition & 1 deletion addon/components/models-table/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ class TableComponent extends Component {
currentGroupingPropertyName = null;

/**
* Bound from [ModelsTable._collapsedGroupValues](Components.ModelsTable.html#property__collapsedGroupValues)
* Bound from [ModelsTable._collapsedGroupValues](Components.ModelsTable.html#property_collapsedGroupValues)
*
* @property collapsedGroupValues
* @type array
Expand Down
6 changes: 0 additions & 6 deletions addon/utils/column.js
Original file line number Diff line number Diff line change
Expand Up @@ -489,9 +489,6 @@ export default class ModelsTableColumn extends EmberObject {
get sortField() {
return this.sortedBy || this.propertyName;
}
set sortField(v) {
return v;
}

/**
* Allow filtering for column or not
Expand All @@ -505,9 +502,6 @@ export default class ModelsTableColumn extends EmberObject {
get useFilter() {
return this.filterField && !this.disableFiltering;
}
set useFilter(v) {
return v;
}

/**
* @protected
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
},
"dependencies": {
"ember-angle-bracket-invocation-polyfill": "^2.0.2",
"ember-cli-babel": "^7.19.0",
"ember-cli-htmlbars": "^4.3.1",
"ember-cli-babel": "^7.20.5",
"ember-cli-htmlbars": "^5.1.2",
"ember-composable-helpers": "^3.0.1",
"ember-decorators": "^6.1.1",
"ember-decorators-polyfill": "^1.1.0",
Expand All @@ -57,14 +57,14 @@
"coveralls": "^3.0.9",
"ember-a11y-testing": "^2.0.0",
"ember-auto-import": "^1.5.3",
"ember-cli": "~3.18.0",
"ember-cli": "~3.19.0",
"ember-cli-code-coverage": "1.0.0-beta.8",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-deprecation-workflow": "^1.0.1",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-mirage": "^0.4.15",
"ember-cli-page-object": "^1.17.1",
"ember-cli-page-object": "^1.17.3",
"ember-cli-sass": "^7.2.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.3",
Expand All @@ -85,12 +85,12 @@
"ember-qunit": "^4.6.0",
"ember-qunit-assert-helpers": "^0.2.0",
"ember-resolver": "^8.0.0",
"ember-source": "~3.18.0",
"ember-source": "~3.19.0",
"ember-source-channel-url": "^2.0.1",
"ember-template-lint": "^2.6.0",
"ember-template-lint": "^2.8.0",
"ember-try": "^1.4.0",
"eslint": "^6.8.0",
"eslint-plugin-ember": "^8.4.0",
"eslint": "^7.1.0",
"eslint-plugin-ember": "^8.6.0",
"eslint-plugin-node": "^11.1.0",
"lcov-result-merger": "^3.1.0",
"loader.js": "^4.7.0",
Expand Down

0 comments on commit 71cb7e8

Please sign in to comment.