|
1925 | 1925 | var target = this.target,
|
1926 | 1926 | dragEvent = new InteractEvent(this, event, 'drag', 'move', this.element),
|
1927 | 1927 | draggableElement = this.element,
|
1928 |
| - drop = this.getDrop(event, draggableElement); |
| 1928 | + drop = this.getDrop(dragEvent, event, draggableElement); |
1929 | 1929 |
|
1930 | 1930 | this.dropTarget = drop.dropzone;
|
1931 | 1931 | this.dropElement = drop.element;
|
|
2309 | 2309 | endEvent = new InteractEvent(this, event, 'drag', 'end', this.element);
|
2310 | 2310 |
|
2311 | 2311 | var draggableElement = this.element,
|
2312 |
| - drop = this.getDrop(event, draggableElement); |
| 2312 | + drop = this.getDrop(endEvent, event, draggableElement); |
2313 | 2313 |
|
2314 | 2314 | this.dropTarget = drop.dropzone;
|
2315 | 2315 | this.dropElement = drop.element;
|
|
2417 | 2417 | }
|
2418 | 2418 | },
|
2419 | 2419 |
|
2420 |
| - getDrop: function (event, dragElement) { |
| 2420 | + getDrop: function (dragEvent, event, dragElement) { |
2421 | 2421 | var validDrops = [];
|
2422 | 2422 |
|
2423 | 2423 | if (dynamicDrop) {
|
|
2430 | 2430 | currentElement = this.activeDrops.elements [j],
|
2431 | 2431 | rect = this.activeDrops.rects [j];
|
2432 | 2432 |
|
2433 |
| - validDrops.push(current.dropCheck(this.pointers[0], event, this.target, dragElement, currentElement, rect) |
| 2433 | + validDrops.push(current.dropCheck(dragEvent, event, this.target, dragElement, currentElement, rect) |
2434 | 2434 | ? currentElement
|
2435 | 2435 | : null);
|
2436 | 2436 | }
|
|
4072 | 4072 | return this.options.drop;
|
4073 | 4073 | },
|
4074 | 4074 |
|
4075 |
| - dropCheck: function (pointer, event, draggable, draggableElement, dropElement, rect) { |
| 4075 | + dropCheck: function (dragEvent, event, draggable, draggableElement, dropElement, rect) { |
4076 | 4076 | var dropped = false;
|
4077 | 4077 |
|
4078 | 4078 | // if the dropzone has no rect (eg. display: none)
|
4079 | 4079 | // call the custom dropChecker or just return false
|
4080 | 4080 | if (!(rect = rect || this.getRect(dropElement))) {
|
4081 | 4081 | return (this.options.drop.checker
|
4082 |
| - ? this.options.drop.checker(pointer, event, dropped, this, dropElement, draggable, draggableElement) |
| 4082 | + ? this.options.drop.checker(dragEvent, event, dropped, this, dropElement, draggable, draggableElement) |
4083 | 4083 | : false);
|
4084 | 4084 | }
|
4085 | 4085 |
|
4086 | 4086 | var dropOverlap = this.options.drop.overlap;
|
4087 | 4087 |
|
4088 | 4088 | if (dropOverlap === 'pointer') {
|
4089 |
| - var page = getPageXY(pointer), |
| 4089 | + var page = getPageXY(dragEvent), |
4090 | 4090 | origin = getOriginXY(draggable, draggableElement),
|
4091 | 4091 | horizontal,
|
4092 | 4092 | vertical;
|
|
4118 | 4118 | }
|
4119 | 4119 |
|
4120 | 4120 | if (this.options.drop.checker) {
|
4121 |
| - dropped = this.options.drop.checker(pointer, event, dropped, this, dropElement, draggable, draggableElement); |
| 4121 | + dropped = this.options.drop.checker(dragEvent, event, dropped, this, dropElement, draggable, draggableElement); |
4122 | 4122 | }
|
4123 | 4123 |
|
4124 | 4124 | return dropped;
|
|
0 commit comments