From c1a751e6c0d320a37fee78ed5982e2e5e0fd0f6e Mon Sep 17 00:00:00 2001 From: Janneke Janssen Date: Mon, 27 Feb 2017 21:29:41 +0100 Subject: [PATCH] Fix reorder past a deleted item --- CHANGELOG.txt | 1 + docs/releases/1.10.rst | 1 + .../wagtailadmin/static_src/wagtailadmin/js/page-editor.js | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3a12d2312b..9cea658b07 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -65,6 +65,7 @@ Changelog * Fix: Fixed display of ManyToMany fields and False values on the ModelAdmin inspect view (Andy Babic) * Fix: Prevent pages from being recursively copied into themselves (Matheus Bratfisch) * Fix: Specifying the full file name in documents URL is mandatory (Morgan Aubert) + * Fix: Reordering inline forms now works correctly when moving past a deleted form (Janneke Janssen) 1.9 (16.02.2017) diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst index 987d1bebf8..237bd1451e 100644 --- a/docs/releases/1.10.rst +++ b/docs/releases/1.10.rst @@ -92,6 +92,7 @@ Bug fixes * Fixed display of ManyToMany fields and False values on the ModelAdmin inspect view (Andy Babic) * Prevent pages from being recursively copied into themselves (Matheus Bratfisch) * Specifying the full file name in documents URL is mandatory (Morgan Aubert) + * Reordering inline forms now works correctly when moving past a deleted form (Janneke Janssen) Upgrade considerations diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js index 30e04818cf..a356e8b777 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js @@ -132,7 +132,7 @@ function InlinePanel(opts) { var currentChildOrder = currentChildOrderElem.val(); /* find the previous visible 'inline_child' li before this one */ - var prevChild = currentChild.prev(':visible'); + var prevChild = currentChild.prevAll(':not(.deleted)').first(); if (!prevChild.length) return; var prevChildOrderElem = prevChild.find('input[name$="-ORDER"]'); var prevChildOrder = prevChildOrderElem.val(); @@ -153,7 +153,7 @@ function InlinePanel(opts) { var currentChildOrder = currentChildOrderElem.val(); /* find the next visible 'inline_child' li after this one */ - var nextChild = currentChild.next(':visible'); + var nextChild = currentChild.nextAll(':not(.deleted)').first(); if (!nextChild.length) return; var nextChildOrderElem = nextChild.find('input[name$="-ORDER"]'); var nextChildOrder = nextChildOrderElem.val();