Skip to content

Support VueJS 2.0 (#19) #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2016
Merged

Support VueJS 2.0 (#19) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3739d90
Support only VueJS 2.0 (#19)
amcsi Oct 9, 2016
c4db504
Support VueJS 1 along with 2
amcsi Oct 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"rollup-plugin-commonjs": "^3.3.1",
"rollup-plugin-node-resolve": "^2.0.0",
"uglify-js": "^2.6.2",
"vue": "^1.0.21",
"vue": "^1.0.21 || ^2.0.0",
"webpack": "^1.12.9"
}
}
33 changes: 23 additions & 10 deletions src/vue-dragula.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ export default function (Vue) {
Vue.directive('dragula', {
params: ['bag'],

bind () {
const container = this.el
const bagName = this.params.bag
bind (container, binding, vnode) {
const bagName = vnode
? vnode.data.attrs.bag // Vue 2
: this.params.bag // Vue 1
if (!vnode) {
container = this.el // Vue 1
}
if (bagName !== undefined && bagName.length !== 0) {
name = bagName
}
Expand All @@ -40,10 +44,15 @@ export default function (Vue) {
service.handleModels(name, drake)
},

update (newValue, oldValue) {
update (container, binding, vnode, oldVnode) {
const newValue = vnode
? binding.value // Vue 2
: container // Vue 1
if (!newValue) { return }

const bagName = this.params.bag
const bagName = vnode
? vnode.data.attrs.bag // Vue 2
: this.params.bag // Vue 1
if (bagName !== undefined && bagName.length !== 0) {
name = bagName
}
Expand All @@ -53,22 +62,26 @@ export default function (Vue) {
drake.models = []
}

let modelContainer = service.findModelContainerByContainer(this.el, drake)
if (!vnode) {
container = this.el // Vue 1
}
let modelContainer = service.findModelContainerByContainer(container, drake)

if (modelContainer) {
modelContainer.model = newValue
} else {
drake.models.push({
model: newValue,
container: this.el
container: container
})
}
},

unbind () {
const container = this.el
unbind (container, binding, vnode) {
let unbindBagName = 'globalBag'
const bagName = this.params.bag
const bagName = vnode
? vnode.data.attrs.bag // Vue 2
: this.params.bag // Vue 1
if (bagName !== undefined && bagName.length !== 0) {
unbindBagName = bagName
}
Expand Down