Skip to content

Commit

Permalink
added updates for ember-bootstrap 1.0.0-alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
simonihmig committed Dec 27, 2016
1 parent 3fc853e commit 135404b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ further details.

## Installation

`ember install ember-bootstrap-changeset-validations`
ember install ember-bootstrap-changeset-validations

You should have installed the ember-bootstrap and ember-changeset addons already. If not install them:

Expand All @@ -25,6 +25,10 @@ if you do not have a custom validation implementation:
ember install ember-changeset-validations
```

If using ember-bootstrap 1.0 (alpha), install the corresponding version of this addon:

ember install [email protected]

## Usage

Define your model and its validations as described in [ember-changeset-validations](https://github.com/poteto/ember-changeset-validations/).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import BsFormElement from 'ember-bootstrap/components/bs-form-element';
import BsFormElement from 'ember-bootstrap/components/bs-form/element';

const { computed, defineProperty, A } = Ember;

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-bootstrap-changeset-validations/components/bs-form-element';
export { default } from 'ember-bootstrap-changeset-validations/components/bs-form/element';
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"devDependencies": {
"broccoli-asset-rev": "^2.4.2",
"ember-ajax": "0.7.1",
"ember-bootstrap": "0.7.0",
"ember-bootstrap": "1.0.0-alpha",
"ember-cli": "2.4.3",
"ember-cli-app-version": "^1.0.0",
"ember-cli-dependency-checker": "^1.2.0",
Expand All @@ -49,7 +49,7 @@
],
"dependencies": {
"ember-cli-babel": "^5.1.6",
"ember-changeset-validations": "^1.0.2"
"ember-changeset-validations": "^1.2.4"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/components/bs-form-element-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ test('valid validation is supported as expected', function(assert) {
});

this.render(hbs`
{{#bs-form model=(changeset model validation) action=(action "submitAction") invalid=(action "invalidAction")}}
{{bs-form-element label="Name" property="name"}}
{{#bs-form model=(changeset model validation) onSubmit=(action "submitAction") onInvalid=(action "invalidAction") as |form|}}
{{form.element label="Name" property="name"}}
{{/bs-form}}
`);

Expand Down Expand Up @@ -63,8 +63,8 @@ test('invalid validation is supported as expected', function(assert) {
});

this.render(hbs`
{{#bs-form model=(changeset model validation) action=(action "submitAction") invalid=(action "invalidAction")}}
{{bs-form-element label="Name" property="name"}}
{{#bs-form model=(changeset model validation) onSubmit=(action "submitAction") onInvalid=(action "invalidAction") as |form|}}
{{form.element label="Name" property="name"}}
{{/bs-form}}
`);

Expand Down

0 comments on commit 135404b

Please sign in to comment.