Skip to content

Commit cf9dd21

Browse files
authored
Merge pull request #19 from jelhan/upgrade-ember-changeset
upgrade ember changeset to v3
2 parents df99479 + 1513110 commit cf9dd21

File tree

6 files changed

+1207
-2456
lines changed

6 files changed

+1207
-2456
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747

4848
# we recommend new addons test the current and previous LTS
4949
# as well as latest stable release (bonus points to beta/canary)
50-
- env: EMBER_TRY_SCENARIO=ember-3.13
5150
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
5251
- env: EMBER_TRY_SCENARIO=ember-release
5352
- env: EMBER_TRY_SCENARIO=ember-beta

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Compatibility
1212

1313
* Ember Bootstrap v3
1414
* Ember Changeset and Ember Changeset Validations v2
15-
* Ember.js v3.13 or above
15+
* Ember.js v3.16 or above
1616
* Ember CLI v2.13 or above
1717
* Node.js v10 or above
1818

addon/components/bs-form/element.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@ import { A } from '@ember/array';
44
import BsFormElement from 'ember-bootstrap/components/bs-form/element';
55

66
export default BsFormElement.extend({
7-
87
hasValidator: notEmpty('model.validate'),
98

109
setupValidations() {
10+
// `Changeset.error` is a getter based on a tracked property. Since it's a
11+
// derived state it's not working together with computed properties smoothly.
12+
// As a work-a-round we observe the `Changeset._errors` computed property
13+
// directly, which holds the state. This is not optimal cause it's private.
14+
// Should refactor to native getter as soon as `<FormElement>` component
15+
// of Ember Bootstrap supports native getters for `FormElement.errors`
16+
// property.
1117
let key = `model.error.${this.get('property')}.validation`;
12-
defineProperty(this, 'errors', computed(`${key}[]`, function() {
18+
defineProperty(this, 'errors', computed(`model._errors`, function() {
1319
return A(this.get(key));
1420
}));
1521
}

config/ember-try.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ module.exports = async function() {
66
return {
77
useYarn: true,
88
scenarios: [
9-
{
10-
name: 'ember-3.13',
11-
npm: {
12-
devDependencies: {
13-
'ember-source': '~3.13.0'
14-
}
15-
}
16-
},
179
{
1810
name: 'ember-lts-3.16',
1911
npm: {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"test:all": "ember try:each"
2727
},
2828
"dependencies": {
29-
"ember-changeset-validations": "^2.1.0",
29+
"ember-changeset-validations": "^3.0.0",
3030
"ember-cli-babel": "^7.17.2",
3131
"ember-cli-htmlbars": "^4.2.2"
3232
},

0 commit comments

Comments
 (0)