diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e06b0470a3..3585f4d50d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -42,6 +42,7 @@ Changelog * Fix: The save and preview buttons in the page editor are now mobile-friendly (Maarten Kling) * Fix: Page links within rich text now respect custom URLs defined on specific page models (Gary Krige, Huub Bouma) * Fix: Default avatar no longer visible when using a transparent gravatar image (Thijs Kramer) + * Fix: Scrolling within the datetime picker is now usable again for touchpads (Ralph Jacobs) 1.9 (16.02.2017) diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst index 7e9b652386..0ab538e52b 100644 --- a/docs/releases/1.10.rst +++ b/docs/releases/1.10.rst @@ -54,6 +54,7 @@ Bug fixes * The save and preview buttons in the page editor are now mobile-friendly (Maarten Kling) * Page links within rich text now respect custom URLs defined on specific page models (Gary Krige, Huub Bouma) * Default avatar no longer visible when using a transparent gravatar image (Thijs Kramer) + * Scrolling within the datetime picker is now usable again for touchpads (Ralph Jacobs) Upgrade considerations diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js index d86bc728c7..d0d2859050 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/vendor/jquery.datetimepicker.js @@ -440,7 +440,7 @@ timeboxparent.on('mousewheel', function (event) { var top = Math.abs(parseInt(timebox.css('marginTop'), 10)); - top = top - (event.deltaY * 20); + top = top - (event.deltaY * 1); if (top < 0) { top = 0; }