|
808 | 808 | .append($('<a class="nav-slider-button" />') |
809 | 809 | ) |
810 | 810 | .mousedown(function (e) { |
811 | | - if (e.preventDefault) { |
812 | | - e.preventDefault(); |
813 | | - } |
| 811 | + e.preventDefault(); |
814 | 812 | element.scrollNavigation.scrollerMouseDown = true; |
815 | 813 | core.sliderScroll(element, e); |
816 | 814 | }) |
|
1300 | 1298 |
|
1301 | 1299 | // Move chart via mousewheel |
1302 | 1300 | wheelScroll: function (element, e) { |
1303 | | - var delta = - 50 * ('detail' in e ? e.detail : - 1/120 * e.originalEvent.wheelDelta); |
| 1301 | + e.preventDefault(); // e is a jQuery Event |
1304 | 1302 |
|
1305 | | - core.scrollPanel(element, delta); |
| 1303 | + // attempts to normalize scroll wheel velocity |
| 1304 | + var delta = ( 'detail' in e ? e.detail : |
| 1305 | + 'wheelDelta' in e.originalEvent ? - 1/120 * e.originalEvent.wheelDelta : |
| 1306 | + e.originalEvent.deltaY ? e.originalEvent.deltaY / Math.abs(e.originalEvent.deltaY) : |
| 1307 | + e.originalEvent.detail ); |
| 1308 | + |
| 1309 | + // simpler normalization, ignoring per-device/browser/platform acceleration & semantic variations |
| 1310 | + //var delta = e.detail || - (e = e.originalEvent).wheelData || e.deltaY /* || e.deltaX */ || e.detail; |
| 1311 | + //delta = ( delta / Math.abs(delta) ) || 0; |
| 1312 | + |
| 1313 | + core.scrollPanel(element, -50 * delta); |
1306 | 1314 |
|
1307 | 1315 | clearTimeout(element.scrollNavigation.repositionDelay); |
1308 | 1316 | element.scrollNavigation.repositionDelay = setTimeout(core.repositionLabel, 50, element); |
1309 | | - |
1310 | | - if (e.preventDefault) { |
1311 | | - e.preventDefault(); |
1312 | | - } else { |
1313 | | - return false; |
1314 | | - } |
1315 | 1317 | }, |
1316 | 1318 |
|
1317 | 1319 | // Move chart via slider control |
|
0 commit comments