Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] preview collapsed repeater titleFrom #1191

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[fix] preview collapsed repeater titleFrom #1191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4f94e6
[fix] preview collapsed preview titleFrom
AIC-BV Aug 26, 2024
e457dce
Update repeater.js
AIC-BV Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/backend/formwidgets/repeater/assets/js/repeater.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
return $textInput.val()
}
} else {
var $disabledTextInput = $('.text-field:first > .form-control', $target)
var $disabledTextInput = $('.form-control:first', $target)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if the text-field class is on $target, could we do &.text-field instead? Also is this currently broken in both update and preview contexts? If so, what is the difference between them that is causing the structure of the fields to be different?

Copy link
Contributor Author

@AIC-BV AIC-BV Aug 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In update context the HTML structure is different.
It has an input field, which is selected in JavaScript.
titleFrom in this context is already working as described in the docs.

In preview mode however, the HTML structure is different.
It does not have an input field, but a <span class='form-control'> instead.
The JavaScript will go in the else part and select the 'disabled text input'.

Here are actually 2 options:

  1. You defined titleFrom: target is the parent of <span class='form-control'>
  2. You didn't define titleFrom: target is the row itself

This is where it goes wrong in preview context.
In case 1, it will try to select .text-field:first but that does not exist because its on the element itself resulting in an empty string.
In case 2, it will find the first ul and display that text. In my case this is not my text field, but a balloon selector. Remember, there are no form fields in preview context. input & select are not present.

So I fixed
Case 1 by removing the .text-field:first because it is an invalid selector. But yes, it could have the &. notation but don't see the advantage of that in this case?
Case 2 will have the same behaviour as before: if there is an <ul> it will get that item first, if not it will get the .form-control:first like in case 1.

--
It is probably not entirely foolproof (working in every form situation) but it must be much better than it currently was because it has the same behaviour and a defined titleFrom now works in preview mode

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do I still need to do something to finish this PR? 🙂

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AIC-BV it seems mostly fine, would you be willing to take a stab at writing a test case for this?

if ($disabledTextInput.length) {
return $disabledTextInput.text()
}
Expand Down
Loading