|
74 | 74 | base.config = $.extend({}, base.defaults, base.options, base.metadata);
|
75 | 75 | base.actionClick={action:false,x:0,y:0};
|
76 | 76 | base.currClick={x:0,y:0};
|
| 77 | + base.scroll=null; |
77 | 78 |
|
78 | 79 | // Initialize plugin data
|
79 | 80 | base.data = $.data(base);
|
|
207 | 208 | if (base.config.touchNav) {
|
208 | 209 | $container.on("touchstart", function (e) {
|
209 | 210 | var eventData = e.originalEvent.touches[0];
|
210 |
| - e.preventDefault(); |
211 | 211 | base._onMoveStart(eventData.pageX, eventData.pageY);
|
212 | 212 | base.actionClick.x=base.currClick.x=eventData.pageX;
|
213 | 213 | base.actionClick.y=base.currClick.y=eventData.pageY;
|
214 | 214 | base.actionClick.action=true;
|
215 |
| - return e.stopPropagation(); |
| 215 | + base.scroll=null; |
216 | 216 | });
|
217 | 217 | $container.on("touchmove", function (e) {
|
218 | 218 | var eventData = e.originalEvent.touches[0];
|
219 |
| - e.preventDefault(); |
220 |
| - base.actionClick.action=false; |
221 |
| - base._onMove(eventData.pageX, eventData.pageY); |
222 |
| - base.currClick.x=eventData.pageX; |
| 219 | + base.currClick.x=eventData.pageX; |
223 | 220 | base.currClick.y=eventData.pageY;
|
224 |
| - return e.stopPropagation(); |
| 221 | + if (base.scroll==null){ |
| 222 | + var dx = Math.abs(base.actionClick.x-base.currClick.x); |
| 223 | + var dy = Math.abs(base.actionClick.y-base.currClick.y); |
| 224 | + if (dx<dy){ |
| 225 | + base.scroll=true; |
| 226 | + } |
| 227 | + else{base.scroll=false;} |
| 228 | + } |
| 229 | + if (!base.scroll){ |
| 230 | + e.preventDefault(); |
| 231 | + base.actionClick.action=false; |
| 232 | + base._onMove(eventData.pageX, eventData.pageY); |
| 233 | + return e.stopPropagation(); |
| 234 | + } |
225 | 235 | });
|
226 | 236 | $container.on("touchend", function (e) {
|
227 | 237 | if ((base.actionClick.action==true)&&(base.actionClick.x==base.currClick.x)&&(base.actionClick.y==base.currClick.y)){
|
|
232 | 242 | }
|
233 | 243 | e.preventDefault();
|
234 | 244 | base._onMoveEnd();
|
| 245 | + base.scroll=null; |
235 | 246 | return e.stopPropagation();
|
236 | 247 | });
|
237 | 248 | }
|
|
0 commit comments