Skip to content

Commit aca38a6

Browse files
Merge remote-tracking branch 'origin/master' into correct_functional_bug
2 parents cf0aba1 + 267d129 commit aca38a6

18 files changed

+3234
-2868
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ npm i -S vuedraggable
7878

7979
```
8080

81-
[cf example section](https://github.com/SortableJS/Vue.Draggable/tree/master/examples)
81+
[cf example section](https://github.com/SortableJS/Vue.Draggable/tree/master/example)
8282

8383
## For Vue.js 2.0
8484

@@ -300,8 +300,8 @@ methods: {
300300
301301
* Support for Sortable events:
302302
303-
`start`, `add`, `remove`, `update`, `end`, `choose`, `sort`, `filter`, `clone`<br>
304-
Events are called whenever onStart, onAdd, onRemove, onUpdate, onEnd, onChoose, onSort, onClone are fired by Sortable.js with the same argument.<br>
303+
`start`, `add`, `remove`, `update`, `end`, `choose`, `unchoose`, `sort`, `filter`, `clone`<br>
304+
Events are called whenever onStart, onAdd, onRemove, onUpdate, onEnd, onChoose, onUnchoose, onSort, onClone are fired by Sortable.js with the same argument.<br>
305305
[See here for reference](https://github.com/RubaXa/Sortable#event-object-demo)
306306
307307
Note that SortableJS OnMove callback is mapped with the [move prop](https://github.com/SortableJS/Vue.Draggable/blob/master/README.md#move)

dist/vuedraggable.common.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vuedraggable.common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vuedraggable.umd.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vuedraggable.umd.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vuedraggable.umd.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vuedraggable.umd.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/app.js

Lines changed: 315 additions & 125 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<template>
2+
<div class="justify-content-between row">
3+
<nested-test class="col-8" v-model="elements" />
4+
<raw-displayer class="col-4" :title="'Vuex Store'" :value="elements" />
5+
</div>
6+
</template>
7+
8+
<script>
9+
import NestedTest from "./nested/nested-test.vue";
10+
import rawDisplayer from "./infra/raw-displayer.vue";
11+
12+
export default {
13+
name: "nested-with-vmodel",
14+
display: "Nested (v-model & vuex)",
15+
order: 16,
16+
components: {
17+
NestedTest,
18+
rawDisplayer
19+
},
20+
computed: {
21+
elements: {
22+
get() {
23+
return this.$store.state.nested.elements;
24+
},
25+
set(value) {
26+
this.$store.dispatch("nested/updateElements", value);
27+
}
28+
}
29+
},
30+
methods: {}
31+
};
32+
</script>

0 commit comments

Comments
 (0)