From b37d16b07b684864eb441ec4c8afb76e8d0bcdb0 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 19 May 2022 15:43:55 +0100 Subject: [PATCH] Adopt a standard data-chooser-modal-choice attribute to identify 'chosen' links --- client/src/entrypoints/documents/document-chooser-modal.js | 1 - client/src/entrypoints/snippets/snippet-chooser-modal.js | 1 - client/src/includes/chooserModal.js | 3 ++- wagtail/documents/views/chooser.py | 2 +- wagtail/snippets/views/chooser.py | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/src/entrypoints/documents/document-chooser-modal.js b/client/src/entrypoints/documents/document-chooser-modal.js index 33361883ec..186f279fa5 100644 --- a/client/src/entrypoints/documents/document-chooser-modal.js +++ b/client/src/entrypoints/documents/document-chooser-modal.js @@ -60,7 +60,6 @@ window.DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS = new DocumentChooserModalOnloadHandlerFactory({ chooseStepName: 'chooser', chosenStepName: 'document_chosen', - chosenLinkSelector: 'a.document-choice', searchFormSelector: 'form.document-search', searchFilterSelectors: ['#collection_chooser_collection_id'], searchInputDelay: 50, diff --git a/client/src/entrypoints/snippets/snippet-chooser-modal.js b/client/src/entrypoints/snippets/snippet-chooser-modal.js index f5085cac56..e2383f6e96 100644 --- a/client/src/entrypoints/snippets/snippet-chooser-modal.js +++ b/client/src/entrypoints/snippets/snippet-chooser-modal.js @@ -2,7 +2,6 @@ import { ChooserModalOnloadHandlerFactory } from '../../includes/chooserModal'; window.SNIPPET_CHOOSER_MODAL_ONLOAD_HANDLERS = new ChooserModalOnloadHandlerFactory({ - chosenLinkSelector: 'a.snippet-choice', searchFormSelector: 'form.snippet-search', searchFilterSelectors: ['#snippet-chooser-locale'], chosenResponseName: 'snippetChosen', diff --git a/client/src/includes/chooserModal.js b/client/src/includes/chooserModal.js index 0654910e8d..328ab2e869 100644 --- a/client/src/includes/chooserModal.js +++ b/client/src/includes/chooserModal.js @@ -143,7 +143,8 @@ class ChooserModalOnloadHandlerFactory { constructor(opts) { this.chooseStepName = opts?.chooseStepName || 'choose'; this.chosenStepName = opts?.chosenStepName || 'chosen'; - this.chosenLinkSelector = opts?.chosenLinkSelector || 'a[data-item-choice]'; + this.chosenLinkSelector = + opts?.chosenLinkSelector || 'a[data-chooser-modal-choice]'; this.paginationLinkSelector = opts?.paginationLinkSelector || '.pagination a'; this.searchFormSelector = opts?.searchFormSelector || 'form[data-search]'; diff --git a/wagtail/documents/views/chooser.py b/wagtail/documents/views/chooser.py index 79871b1106..4b3bd1afc1 100644 --- a/wagtail/documents/views/chooser.py +++ b/wagtail/documents/views/chooser.py @@ -106,7 +106,7 @@ class BaseChooseView(View): "title", label=_("Title"), url_name="wagtaildocs:document_chosen", - link_classname="document-choice", + link_attrs={"data-chooser-modal-choice": True}, ), DownloadColumn("filename", label=_("File")), DateColumn("created_at", label=_("Created"), width="16%"), diff --git a/wagtail/snippets/views/chooser.py b/wagtail/snippets/views/chooser.py index c4fa5471c7..3ac59890cc 100644 --- a/wagtail/snippets/views/chooser.py +++ b/wagtail/snippets/views/chooser.py @@ -101,7 +101,7 @@ class BaseChooseView(View): "title", self.model, label=_("Title"), - link_classname="snippet-choice", + link_attrs={"data-chooser-modal-choice": True}, ), ], self.paginated_items,