@@ -56,7 +56,7 @@ function initializeFieldsWithJavascript(container) {
5656 function getFirstFocusableField (form ) {
5757 return form .find (' input, select, textarea, button' )
5858 .not (' .close' )
59- .not (' [readonly ]' )
59+ .not (' [disabled ]' )
6060 .filter (' :visible:first' );
6161 }
6262
@@ -65,7 +65,7 @@ function getFirstFocusableField(form) {
6565 * @param {jQuery} firstField
6666 */
6767 function triggerFocusOnFirstInputField (firstField ) {
68- if (firstField .hasClass (' select2_field ' )) {
68+ if (firstField .hasClass (' select2-hidden-accessible ' )) {
6969 return handleFocusOnSelect2Field (firstField);
7070 }
7171
@@ -81,13 +81,7 @@ function triggerFocusOnFirstInputField(firstField) {
8181 */
8282 function handleFocusOnSelect2Field (firstField ){
8383 $ (' .select2-search__field' ).remove ();
84-
85- const checkSelect2 = setTimeout (function () {
86- if (firstField .hasClass (' select2-hidden-accessible' )) {
87- firstField .select2 (' open' );
88- clearInterval (checkSelect2);
89- }
90- }, 150 );
84+ firstField .select2 (' open' );
9185 }
9286
9387 /*
@@ -161,13 +155,15 @@ function preventUnload(event) {
161155 });
162156 @endphp
163157
158+ let focusField;
159+
164160 @if ($focusField )
165161 @php
166162 $focusFieldName = isset ($focusField [' value' ]) && is_iterable ($focusField [' value' ]) ? $focusField [' name' ] . ' []' : $focusField [' name' ];
167163 @endphp
168- const focusField = $ (' [name="{{ $focusFieldName } } "]' ).eq (0 );
164+ focusField = $ (' [name="{{ $focusFieldName } } "]' ).eq (0 );
169165 @else
170- const focusField = getFirstFocusableField ($ (' form' ));
166+ focusField = getFirstFocusableField ($ (' form' ));
171167 @endif
172168
173169 const fieldOffset = focusField .offset ().top ;
0 commit comments