lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: avoid focus problem when select2 is in a modal dialog window

Browse Source
This commit is contained in:
Regis Houssin 2018-04-13 17:10:07 +02:00
parent 04aafbc493
commit 199bf4c044
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/ajax.lib.php
View File

@ -386,10 +386,11 @@ function ajax_autoselect($htmlname, $addlink='')
* @param int $minLengthToAutocomplete Minimum length of input string to start autocomplete * @param int $minLengthToAutocomplete Minimum length of input string to start autocomplete
* @param int $forcefocus Force focus on field * @param int $forcefocus Force focus on field
* @param string $widthTypeOfAutocomplete 'resolve' or 'off' * @param string $widthTypeOfAutocomplete 'resolve' or 'off'
* @param string $modalid ID of modal (for avoid focus problem when select2 is in a modal dialog window)
* @return string Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason. * @return string Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason.
* @see selectArrayAjax of html.form.class * @see selectArrayAjax of html.form.class
*/ */
function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve') function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve', $modalid='dialog-confirm')
{ {
global $conf; global $conf;
@ -425,7 +426,8 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
}, },
escapeMarkup: function(markup) { escapeMarkup: function(markup) {
return markup; return markup;
} },
dropdownParent: $(\'#'.$modalid.'\')
})'; })';
if ($forcefocus) $msg.= '.select2(\'focus\')'; if ($forcefocus) $msg.= '.select2(\'focus\')';
$msg.= ';'."\n"; $msg.= ';'."\n";