diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d7efbad1e0..4c2716091d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -20,6 +20,7 @@ Changelog * Fix: Header for search results on the redirects index page now shows the correct count when the listing is paginated (Nick Smith) * Fix: `set_url_paths` management command is now compatible with Django 1.10 (Benjamin Bach) * Fix: Form builder email notifications now output multiple values correctly (Sævar Öfjörð Magnússon) + * Fix: Closing 'more' dropdown on explorer no longer jumps to the top of the page (Ducky) 1.7 (20.10.2016) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 83cae3d20d..1086c4956f 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -175,6 +175,7 @@ Contributors * Henk-Jan van Hasselaar * alexfromvl * Jaap Roes +* Ducky Translators =========== diff --git a/docs/releases/1.8.rst b/docs/releases/1.8.rst index e5beced50f..718abc9d20 100644 --- a/docs/releases/1.8.rst +++ b/docs/releases/1.8.rst @@ -42,6 +42,7 @@ Bug fixes * Header for search results on the redirects index page now shows the correct count when the listing is paginated (Nick Smith) * ``set_url_paths`` management command is now compatible with Django 1.10 (Benjamin Bach) * Form builder email notifications now output multiple values correctly (Sævar Öfjörð Magnússon) + * Closing 'more' dropdown on explorer no longer jumps to the top of the page (Ducky) Upgrade considerations ====================== diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js index 4cc4969417..7fc322bd21 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/core.js @@ -427,6 +427,8 @@ wagtail = (function(document, window, wagtail) { _closeDropDown: function(e) { this.state.isOpen = false; + e.stopPropagation(); + e.preventDefault(); var el = this.el; var $parent = this.$parent; @@ -474,6 +476,3 @@ wagtail = (function(document, window, wagtail) { return wagtail; })(document, window, wagtail); - - -