Skip to content

Commit

Permalink
Merge 0dd5283 into 9bec4fa
Browse files Browse the repository at this point in the history
  • Loading branch information
sandersky committed Aug 4, 2016
2 parents 9bec4fa + 0dd5283 commit 4955b1d
Show file tree
Hide file tree
Showing 452 changed files with 19,052 additions and 12,280 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/connect.lock
/coverage/*
/libpeerconnection.log
coverage.json
npm-debug.log
testem.log
.idea
Expand Down
19 changes: 15 additions & 4 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
.travis/
bower_components/
coverage/
dist/
node_modules/
tests/
tmp/
dist/

**/.gitkeep

.bowerrc
.DS_Store
.editorconfig
.ember-cli
.travis.yml
.eslintignore
.eslintrc
.idea
.npmignore
**/.gitkeep
.pullapprove.yml
.remarkrc
.sass-lint.yml
.travis.yml
bower.json
Brocfile.js
testem.js
testem.json
.idea
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ env:
matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
before_install:
Expand Down
119 changes: 48 additions & 71 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,11 @@ ember install ember-frost-bunsen
| `autofocus` | `boolean` | No | Whether or not to focus on first input |
| `bunsenModel` | `Ember.Object` or `object` | Yes | Value definition |
| `bunsenView` | `Ember.Object` or `object` | No | View definition |
| `cancelLabel` | `string` | No | Text for cancel button |
| `disabled` | `boolean` | No | Whether or not to disable entire form |
| `inline` | `boolean` | No | Whether or not to render form inline |
| `onCancel` | `Function` | No | Callback for when form is cancelled |
| `onChange` | `Function` | No | Callback for when form values change |
| `onSubmit` | `Function` | No | Callback for when form is submitted |
| `onValidation` | `Function` | No | Callback for when form is validated |
| `renderers` | `Ember.Object` or `object` | No | Custom renderer template helper mappings |
| `showAllErrors` | `boolean` | No | Whether or not to show error messages before user interaction occurs |
| `submitLabel` | `string` | No | Text for submit button |
| `validators` | `Array<Function>` | No | List of custom validation functions |
| `value` | `Ember.Object` or `object` | No | Value to initialize form with |

Expand Down Expand Up @@ -84,7 +79,7 @@ ember install ember-frost-bunsen
}}
```

> Note: ALL values, models, and views MUST be valid [JSON](http://www.json.org/). Values are simply the data being represented in the UI which usually come directly from an API response. Models must be valid [JSON Schema](http://json-schema.org/) and views must be valid [view schema](https://github.com/ciena-frost/ember-frost-bunsen/blob/master/addon/components/validator/view-schema.js). Below we will provide examples of values, models, and views to give you a better idea of how this stuff works.
> Note: ALL values, models, and views MUST be valid [JSON](http://www.json.org/). Values are simply the data being represented in the UI which usually come directly from an API response. Models must be valid [JSON Schema](http://json-schema.org/) and views must be valid [view schema](https://github.com/ciena-blueplanet/bunsen-core/tree/master/src/validator/view-schemas). Below we will provide examples of values, models, and views to give you a better idea of how this stuff works.
### Minimal Example

Expand Down Expand Up @@ -113,23 +108,20 @@ ember install ember-frost-bunsen

```json
{
"version": "1.0",
"type": "form",
"rootContainers": {
"cellDefinitions": {
"main": {
"children": [
{"model": "firstName"},
{"model": "lastName"}
]
}
},
"cells": {
"label": "Main",
"id": "main"
},
"containers": [
{
"id": "main",
"rows": [
[
{"model": "firstName"},
{"model": "lastName"},
]
]
}
]
"type": "form",
"version": "2.0"
}
```

Expand Down Expand Up @@ -167,23 +159,20 @@ ember install ember-frost-bunsen

```json
{
"version": "1.0",
"type": "form",
"rootContainers": {
"cellDefinitions": {
"main": {
"children": [
{"model": "name.first"},
{"model": "name.last"}
]
}
},
"cells": {
"label": "Main",
"id": "main"
},
"containers": [
{
"id": "main",
"rows": [
[
{"model": "name.first"},
{"model": "name.last"},
]
]
}
]
"type": "form",
"version": "2.0"
}
```

Expand Down Expand Up @@ -227,32 +216,29 @@ ember install ember-frost-bunsen

```json
{
"version": "1.0",
"type": "form",
"rootContainers": {
"cellDefinitions": {
"main": {
"children": [
{"model": "name"},
{"model": "age"},
{"model": "married"},
{
"label": "Spouse's Name",
"model": "spouse.name"
},
{
"label": "Spouse's Age",
"model": "spouse.age"
}
]
}
},
"cells": {
"label": "Main",
"id": "main"
},
"containers": [
{
"id": "main",
"rows": [
[
{"model": "name"},
{"model": "age"},
{"model": "married"},
{
"label": "Spouse's Name",
"model": "spouse.name"
},
{
"label": "Spouse's Age",
"model": "spouse.age"
}
]
]
}
]
"type": "form",
"version": "2.0"
}
```

Expand Down Expand Up @@ -314,22 +300,13 @@ message:

```json
{
"version": "1.0",
"type": "form",
"rootContainers": {
"label": "Main",
"id": "main"
},
"containers": [
"cells": [
{
"id": "main",
"rows": [
[
{"model": "palindrome"},
]
]
"model": "palindrome"
}
]
],
"type": "form",
"version": "2.0"
}
```

Expand Down
167 changes: 0 additions & 167 deletions addon/actions.js

This file was deleted.

Loading

0 comments on commit 4955b1d

Please sign in to comment.