Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Revert "NEW enable free emails input with select2"

Browse Source
This commit is contained in:
Laurent Destailleur
2020-05-25 22:56:29 +02:00
committed by GitHub
parent 26eab1f285
commit d169162ef1
5 changed files with 19 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
htdocs/core/class/html.form.class.php
View File

@@ -6621,11 +6621,10 @@ class Form
* @param string $elemtype Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.
* @param string $placeholder String to use as placeholder
* @param int $addjscombo Add js combo
* @param int $enablefreetag 0 no free tag, 1 enable free tag for elemtype
* @return string HTML multiselect string
* @see selectarray(), selectArrayAjax(), selectArrayFilter()
*/
public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1, $enablefreetag = 0)
public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1)
{
global $conf, $langs;
@@ -6667,50 +6666,13 @@ class Form
$out .= '$(document).ready(function () {
$(\'#'.$htmlname.'\').'.$tmpplugin.'({
dir: \'ltr\',
tags: '.($enablefreetag?'true':'false').',
// Specify format function for dropdown item
formatResult: formatResult,
/* For 4.0 */
templateResult: formatResult,
templateResult: formatResult, /* For 4.0 */
// Specify format function for selected item
formatSelection: formatSelection,
/* For 4.0 */
templateSelection: formatSelection';
if ($enablefreetag && $elemtype == 'email') {
$out .= ',
createTag: function (params) {
var REGEX_EMAIL = "([a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@" +
"(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)";
// Dont offset to create a tag if there is no @ symbol
if (params.term.indexOf("@") === -1) {
// Return null to disable tag creation
return null;
}
var match = params.term.match(new RegExp("^([^<]*)\<" + REGEX_EMAIL + "\>$", "i"));
// console.log(match);
if (match !== null) {
return {
id: $.trim(match[1]) + " <" + match[2] + ">",
text: $.trim(match[1]) + " <" + match[2] + ">"
}
}
if (params.term.indexOf("<") >= 0) {
// Return null to disable tag creation
return null;
}
var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
// console.log(match);
if (match !== null) {
var pos = params.term.indexOf("@");
return {
id: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">",
text: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">"
}
}
return null;
}';
}
$out .= ' });
templateSelection: formatSelection /* For 4.0 */
});
});'."\n";
}
elseif ($addjscombo == 2)