|
2726 | 2726 |
|
2727 | 2727 | if (inertiaStatus.active) { return; }
|
2728 | 2728 |
|
2729 |
| - var deltaSource =target.options.deltaSource, |
| 2729 | + var deltaSource = options.deltaSource, |
2730 | 2730 | pointerSpeed = pointerDelta[deltaSource + 'Speed'],
|
2731 | 2731 | now = new Date().getTime(),
|
2732 | 2732 | inertiaPossible = false,
|
|
2737 | 2737 | startEvent;
|
2738 | 2738 |
|
2739 | 2739 | // check if inertia should be started
|
2740 |
| - inertiaPossible = (target.options.inertiaEnabled |
| 2740 | + inertiaPossible = (options.inertiaEnabled |
2741 | 2741 | && prepared !== 'gesture'
|
2742 | 2742 | && indexOf(inertiaOptions.actions, prepared) !== -1
|
2743 | 2743 | && event !== inertiaStatus.startEvent);
|
|
2819 | 2819 |
|
2820 | 2820 | dx = dy = 0;
|
2821 | 2821 |
|
2822 |
| - if (target.options.snapEnabled && target.options.snap.endOnly |
2823 |
| - && indexOf(target.options.snap.actions, prepared) !== -1) { |
| 2822 | + if (options.snapEnabled && options.snap.endOnly |
| 2823 | + && indexOf(options.snap.actions, prepared) !== -1) { |
2824 | 2824 |
|
2825 | 2825 | var snap = setSnapping(event, statusObject);
|
2826 | 2826 |
|
|
2830 | 2830 | }
|
2831 | 2831 | }
|
2832 | 2832 |
|
2833 |
| - if (target.options.restrictEnabled && target.options.restrict.endOnly) { |
| 2833 | + if (options.restrictEnabled && options.restrict.endOnly) { |
2834 | 2834 | var restrict = setRestriction(event, statusObject);
|
2835 | 2835 |
|
2836 | 2836 | if (restrict.restricted) {
|
|
2858 | 2858 | return;
|
2859 | 2859 | }
|
2860 | 2860 |
|
2861 |
| - if ((target.options.snapEnabled && target.options.snap.endOnly) |
2862 |
| - || (target.options.restrictEnabled && target.options.restrict.endOnly)) { |
| 2861 | + if ((options.snapEnabled && options.snap.endOnly) |
| 2862 | + || (options.restrictEnabled && options.restrict.endOnly)) { |
2863 | 2863 | // fire a move event at the snapped coordinates
|
2864 | 2864 | pointerMove(event, true);
|
2865 | 2865 | }
|
|
0 commit comments