Skip to content

isValidDrag should ignore "tap" events #105

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

Closed
sdumetz wants to merge 6 commits into from
Closed

isValidDrag should ignore "tap" events #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c50e137
fixed getPointer & drag functions for touch screen
Jun 2, 2014
8e5fd30
isValidDrag should ignore "tap" events
Jun 2, 2014
5a859df
added the middleman command to start dev version
Jun 2, 2014
c05f7af
gitignored rvm files
Jun 2, 2014
aa79f87
Merge branch 'patch-1'
Jun 2, 2014
d2c27f3
registered touchmove as event for drag detection
Jun 2, 2014
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
/.sass-cache
/build
/.bundle

.ruby-gemset
.ruby-version

# tempfiles
*[~#]
Expand Down
2 changes: 2 additions & 0 deletions README.mkd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ jquery (>= 1.7.0)

jQuery Sortable is developed using [middleman](http://middlemanapp.com/).
A **bundle install** shoud pull in everything needed.
bundle exec middleman server
This will start a local web server running at: http://localhost:4567/
12 changes: 6 additions & 6 deletions source/js/jquery-sortable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
right:0
},
eventNames = {
start: "touchstart.sortable mousedown.sortable",
start: "touchmove.sortable mousedown.sortable",
drop: "touchend.sortable touchcancel.sortable mouseup.sortable",
drag: "touchmove.sortable mousemove.sortable",
scroll: "scroll.sortable"
Expand Down Expand Up @@ -268,8 +268,8 @@
groupDefaults.onDrag,
e)

var x = e.pageX || e.originalEvent.pageX,
y = e.pageY || e.originalEvent.pageY,
var x = e.pageX || e.originalEvent.targetTouches[0].pageX,
y = e.pageY || e.originalEvent.targetTouches[0].pageY,
box = this.sameResultBox,
t = this.options.tolerance

Expand Down Expand Up @@ -390,8 +390,8 @@
},
getPointer: function(e) {
return {
left: e.pageX || e.originalEvent.pageX,
top: e.pageY || e.originalEvent.pageY
left: e.pageX || e.originalEvent.targetTouches[0].pageX,
top: e.pageY || e.originalEvent.targetTouches[0].pageY
}
},
setupDelayTimer: function () {
Expand Down Expand Up @@ -472,7 +472,7 @@
},
isValidDrag: function(e) {
return e.which == 1 ||
e.type == "touchstart" && e.originalEvent.touches.length == 1
e.type == "touchmove" && e.originalEvent.touches.length == 1
},
searchValidTarget: function (pointer, lastPointer) {
var distances = sortByDistanceDesc(this.getItemDimensions(),
Expand Down