Skip to content

Commit

Permalink
Merge pull request #19 from cassioscabral/next_cassio
Browse files Browse the repository at this point in the history
Update next branch
  • Loading branch information
xiaokaike committed Oct 25, 2016
2 parents 1869318 + 5e64226 commit efa5741
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
23 changes: 16 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,22 @@ new Vue({
```

```html
<material-picker :colors.sync="colors"></material-picker>
<compact-picker :colors.sync="colors"></compact-picker>
<swatches-picker :colors.sync="colors"></swatches-picker>
<slider-picker :colors.sync="colors"></slider-picker>
<sketch-picker :colors.sync="colors"></sketch-picker>
<chrome-picker :colors.sync="colors"></chrome-picker>
<photoshop-picker :colors.sync="colors"></photoshop-picker>
<!-- suppose you have the data 'colors' in your component -->
<material-picker v-model="colors" @change-color="onChange"></material-picker>
<material-picker v-model="colors" @change-color="onChange"></material-picker>
<compact-picker v-model="colors" @change-color="onChange"></compact-picker>
<swatches-picker v-model="colors" @change-color="onChange"></swatches-picker>
<slider-picker v-model="colors" @change-color="onChange"></slider-picker>
<sketch-picker v-model="colors" @change-color="onChange"></sketch-picker>
<chrome-picker v-model="colors" @change-color="onChange"></chrome-picker>
<photoshop-picker v-model="colors" @change-color="onChange"></photoshop-picker>
```

```javascript
// onChange method called when the event 'change-color' is emitted
onChange (val) {
this.colors = val
}
```

## TODO
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@
"stylus": "^0.54.5",
"stylus-loader": "^2.1.1",
"url-loader": "^0.5.7",
"vue": "2.0.1",
"vue": "^2.0.3",
"vue-hot-reload-api": "^1.3.x",
"vue-html-loader": "^1.2.x",
"vue-loader": "9.5.1",
"vue-template-compiler": "^2.0.0-rc.5",
"vue-template-compiler": "^2.0.3",
"vue-style-loader": "^1.0.0",
"webpack": "^1.12.2",
"webpack-dev-middleware": "^1.4.0",
Expand Down

0 comments on commit efa5741

Please sign in to comment.