|
251 | 251 | var _this = this;
|
252 | 252 | this.scrollable.$element.mousewheel(function (event, delta, deltaX, deltaY) {
|
253 | 253 | if (_this.enabled) {
|
254 |
| - _this.mouseWheelScroll(deltaX, deltaY); |
255 |
| - return false; |
| 254 | + if (_this.mouseWheelScroll(deltaX, deltaY)) { |
| 255 | + event.stopPropagation(); |
| 256 | + event.preventDefault(); |
| 257 | + } |
256 | 258 | }
|
257 | 259 | });
|
258 | 260 | },
|
|
364 | 366 | touchScroll: function (event) {
|
365 | 367 | if (this.touchScrolling && event.touches && event.touches.length == 1) {
|
366 | 368 | var delta = -this.sizing.mouseDelta(this.scrollEvent, event.touches[0]) * this.scrollable.options.swipeSpeed;
|
367 |
| - this.scrollOverviewBy(delta); |
| 369 | + var scrolled = this.scrollOverviewBy(delta); |
368 | 370 | this.setScrollEvent(event.touches[0]);
|
369 |
| - event.stopPropagation(); |
370 |
| - event.preventDefault(); |
| 371 | + if (scrolled) { |
| 372 | + event.stopPropagation(); |
| 373 | + event.preventDefault(); |
| 374 | + } |
371 | 375 | }
|
372 | 376 | },
|
373 | 377 |
|
|
379 | 383 | mouseWheelScroll: function (deltaX, deltaY) {
|
380 | 384 | var delta = -this.sizing.wheelDelta(deltaX, deltaY) * this.scrollable.options.wheelSpeed;
|
381 | 385 | if (delta != 0)
|
382 |
| - this.scrollOverviewBy(delta); |
| 386 | + return this.scrollOverviewBy(delta); |
383 | 387 | },
|
384 | 388 |
|
385 | 389 | mouseClickScroll: function (event) {
|
|
393 | 397 | keyScroll: function (event) {
|
394 | 398 | var keyDown = event.which;
|
395 | 399 | if (this.enabled && this.isKeyScrolling(keyDown)) {
|
396 |
| - this.scrollOverviewBy(this.keyScrollDelta(keyDown)); |
397 |
| - event.preventDefault(); |
| 400 | + if (this.scrollOverviewBy(this.keyScrollDelta(keyDown))) |
| 401 | + event.preventDefault(); |
398 | 402 | }
|
399 | 403 | },
|
400 | 404 |
|
|
406 | 410 | this.scrollPercent = thumbPosition / this.maxThumbPosition;
|
407 | 411 | var overviewPosition = (thumbPosition * this.maxOverviewPosition) / this.maxThumbPosition;
|
408 | 412 | this.setScrollPosition(overviewPosition, thumbPosition);
|
409 |
| - if (oldScrollPercent != this.scrollPercent) |
| 413 | + if (oldScrollPercent != this.scrollPercent) { |
410 | 414 | this.triggerCustomScroll(oldScrollPercent);
|
| 415 | + return true |
| 416 | + } |
| 417 | + else |
| 418 | + return false; |
411 | 419 | },
|
412 | 420 |
|
413 | 421 | thumbPosition: function () {
|
|
416 | 424 |
|
417 | 425 | scrollOverviewBy: function (delta) {
|
418 | 426 | var overviewPosition = this.overviewPosition() + delta;
|
419 |
| - this.scrollOverviewTo(overviewPosition, false); |
| 427 | + return this.scrollOverviewTo(overviewPosition, false); |
420 | 428 | },
|
421 | 429 |
|
422 | 430 | overviewPosition: function () {
|
|
432 | 440 | this.setScrollPositionWithAnimation(overviewPosition, thumbPosition);
|
433 | 441 | else
|
434 | 442 | this.setScrollPosition(overviewPosition, thumbPosition);
|
435 |
| - if (oldScrollPercent != this.scrollPercent) |
| 443 | + if (oldScrollPercent != this.scrollPercent) { |
436 | 444 | this.triggerCustomScroll(oldScrollPercent);
|
| 445 | + return true; |
| 446 | + } |
| 447 | + else |
| 448 | + return false; |
437 | 449 | },
|
438 | 450 |
|
439 | 451 | positionOrMax: function (p, max) {
|
|
0 commit comments