|
373 | 373 | return this.offsetParent |
374 | 374 | }, |
375 | 375 | setPointer: function (e) { |
376 | | - var pointer = { |
377 | | - left: e.pageX || e.originalEvent.pageX, |
378 | | - top: e.pageY || e.originalEvent.pageX |
379 | | - } |
| 376 | + var pointer = this.getPointer(e) |
380 | 377 |
|
381 | 378 | if(this.$getOffsetParent()){ |
382 | 379 | var relativePointer = getRelativePosition(pointer, this.$getOffsetParent()) |
|
388 | 385 | this.pointer = pointer |
389 | 386 | }, |
390 | 387 | distanceMet: function (e) { |
391 | | - if(e.pageX == undefined || e.pageY == undefined) { |
392 | | - return (Math.max( |
393 | | - Math.abs(this.pointer.left - e.originalEvent.pageX), |
394 | | - Math.abs(this.pointer.top - e.originalEvent.pageY) |
395 | | - ) >= this.options.distance) |
396 | | - } |
397 | | - else { |
398 | | - return (Math.max( |
399 | | - Math.abs(this.pointer.left - e.pageX), |
400 | | - Math.abs(this.pointer.top - e.pageY) |
401 | | - ) >= this.options.distance) |
| 388 | + var currentPointer = this.getPointer(e) |
| 389 | + return (Math.max( |
| 390 | + Math.abs(this.pointer.left - currentPointer.left), |
| 391 | + Math.abs(this.pointer.top - currentPointer.top) |
| 392 | + ) >= this.options.distance) |
| 393 | + }, |
| 394 | + getPointer: function(e) { |
| 395 | + return { |
| 396 | + left: e.pageX || e.originalEvent.pageX, |
| 397 | + top: e.pageY || e.originalEvent.pageY |
402 | 398 | } |
403 | 399 | }, |
404 | 400 | setupDelayTimer: function () { |
|
466 | 462 | var rootGroup = this.rootGroup |
467 | 463 |
|
468 | 464 | if( !rootGroup.dragInitDone && |
469 | | - e.which === 1 && |
470 | | - this.options.drag) { |
| 465 | + this.options.drag && |
| 466 | + this.isValidDrag(e)) { |
471 | 467 | rootGroup.dragInit(e, this) |
472 | 468 | } |
473 | 469 | }, |
| 470 | + isValidDrag: function(e) { |
| 471 | + if(e.type == "touchstart"){ |
| 472 | + return e.originalEvent.touches.length == 1; |
| 473 | + } else { |
| 474 | + return e.which == 1 |
| 475 | + } |
| 476 | + }, |
474 | 477 | searchValidTarget: function (pointer, lastPointer) { |
475 | 478 | var distances = sortByDistanceDesc(this.getItemDimensions(), |
476 | 479 | pointer, |
|
0 commit comments