Skip to content
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

fix: #36 Cannot drag -x or -y from the parent #37

Merged
merged 9 commits into from
Oct 23, 2017
Merged

fix: #36 Cannot drag -x or -y from the parent #37

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ae60b2
Implement :z prop and watcher.
alxpez Sep 18, 2017
b89d664
Update App.vue for functionality test
alxpez Sep 18, 2017
f13900a
Merge branch 'master' of mauricius/vue-draggable-resizable
alxpez Sep 20, 2017
92076d9
Implement vdr recursion (inception-mode)
alxpez Sep 21, 2017
80877dc
clear app changes
alxpez Sep 21, 2017
5827058
remove prevent modifier
alxpez Sep 21, 2017
d119be3
Merge remote-tracking branch 'upstream/master'
alxpez Oct 19, 2017
78f38e9
mauricius/vue-draggable-resizabl#36
alxpez Oct 19, 2017
fce2dc7
revert changes
alxpez Oct 19, 2017
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
14 changes: 8 additions & 6 deletions src/components/vue-draggable-resizable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ export default {
type: Number,
default: 0,
validator: function (val) {
return val >= 0
return typeof val === 'number'
}
},
y: {
type: Number,
default: 0,
validator: function (val) {
return val >= 0
return typeof val === 'number'
}
},
z: {
Expand Down Expand Up @@ -327,11 +327,13 @@ export default {

this.$emit('resizing', this.left, this.top, this.width, this.height)
} else if (this.dragging) {
if (this.elmX + dX < this.parentX) this.mouseOffX = (dX - (diffX = this.parentX - this.elmX))
else if (this.elmX + this.elmW + dX > this.parentW) this.mouseOffX = (dX - (diffX = this.parentW - this.elmX - this.elmW))
if (this.parent) {
if (this.elmX + dX < this.parentX) this.mouseOffX = (dX - (diffX = this.parentX - this.elmX))
else if (this.elmX + this.elmW + dX > this.parentW) this.mouseOffX = (dX - (diffX = this.parentW - this.elmX - this.elmW))

if (this.elmY + dY < this.parentY) this.mouseOffY = (dY - (diffY = this.parentY - this.elmY))
else if (this.elmY + this.elmH + dY > this.parentH) this.mouseOffY = (dY - (diffY = this.parentH - this.elmY - this.elmH))
if (this.elmY + dY < this.parentY) this.mouseOffY = (dY - (diffY = this.parentY - this.elmY))
else if (this.elmY + this.elmH + dY > this.parentH) this.mouseOffY = (dY - (diffY = this.parentH - this.elmY - this.elmH))
}

this.elmX += diffX
this.elmY += diffY
Expand Down