[4.0] Replace chosen.js to choice.js

administrator/components/com_banners/tmpl/banner/edit.php

@@ -15,7 +15,6 @@
 use Joomla\CMS\Router\Route;
 
 HTMLHelper::_('behavior.formvalidator');
-HTMLHelper::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
 
 HTMLHelper::_('script', 'com_banners/admin-banner-edit.min.js', array('version' => 'auto', 'relative' => true));
 ?>

administrator/components/com_categories/Field/CategoryeditField.php

@@ -11,20 +11,18 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\Utilities\ArrayHelper;
-
-FormHelper::loadFieldClass('list');
 
 /**
  * Category Edit field..
  *
  * @since  1.6
  */
-class CategoryeditField extends \JFormFieldList
+class CategoryeditField extends ListField
 {
 	/**
 	 * To allow creation of new categories.
@@ -42,6 +40,14 @@ class CategoryeditField extends \JFormFieldList
 	 */
 	public $type = 'CategoryEdit';
 
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $layout = 'joomla.form.field.categoryedit';
+
 	/**
 	 * Method to attach a JForm object to the field.
 	 *
@@ -340,88 +346,15 @@ protected function getOptions()
 	 */
 	protected function getInput()
 	{
-		$html = array();
-		$class = array();
-		$attr = '';
-
-		// Initialize some field attributes.
-		$class[] = !empty($this->class) ? $this->class : '';
-
-		if ($this->allowAdd)
-		{
-			$customGroupText = Text::_('JGLOBAL_CUSTOM_CATEGORY');
-
-			$class[] = 'chosen-custom-value';
-			$attr .= ' data-custom_group_text="' . $customGroupText . '" '
-					. 'data-no_results_text="' . Text::_('JGLOBAL_ADD_CUSTOM_CATEGORY') . '" '
-					. 'data-placeholder="' . Text::_('JGLOBAL_TYPE_OR_SELECT_CATEGORY') . '" ';
-		}
-
-		if ($class)
-		{
-			$attr .= 'class="' . implode(' ', $class) . '"';
-		}
-
-		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
-		$attr .= $this->multiple ? ' multiple' : '';
-		$attr .= $this->required ? ' required' : '';
-		$attr .= $this->autofocus ? ' autofocus' : '';
-
-		// To avoid user's confusion, readonly="true" should imply disabled="true".
-		if ((string) $this->readonly == '1'
-			|| (string) $this->readonly == 'true'
-			|| (string) $this->disabled == '1'
-			|| (string) $this->disabled == 'true')
-		{
-			$attr .= ' disabled="disabled"';
-		}
-
-		// Initialize JavaScript field attributes.
-		$attr .= $this->onchange ? ' onchange="' . $this->onchange . '"' : '';
-
-		// Get the field options.
-		$options = (array) $this->getOptions();
+		$data = $this->getLayoutData();
 
-		// Create a read-only list (no name) with hidden input(s) to store the value(s).
-		if ((string) $this->readonly == '1' || (string) $this->readonly == 'true')
-		{
-			$html[] = HTMLHelper::_('select.genericlist', $options, '', trim($attr), 'value', 'text', $this->value, $this->id);
+		$data['options']     = $this->getOptions();
+		$data['allowCustom'] = $this->allowAdd;
 
-			// E.g. form field type tag sends $this->value as array
-			if ($this->multiple && is_array($this->value))
-			{
-				if (!count($this->value))
-				{
-					$this->value[] = '';
-				}
-
-				foreach ($this->value as $value)
-				{
-					$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '">';
-				}
-			}
-			else
-			{
-				$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '">';
-			}
-		}
-		else
-		{
-			// Create a regular list.
-			if (count($options) === 0)
-			{
-				// All Categories have been deleted, so we need a new category (This will create on save if selected).
-				$options[0]            = new \stdClass;
-				$options[0]->value     = 'Uncategorised';
-				$options[0]->text      = 'Uncategorised';
-				$options[0]->level     = '1';
-				$options[0]->published = '1';
-				$options[0]->lft       = '1';
-			}
-
-			$html[] = HTMLHelper::_('select.genericlist', $options, $this->name, trim($attr), 'value', 'text', $this->value, $this->id);
-		}
+		$renderer = $this->getRenderer($this->layout);
+		$renderer->setComponent('com_categories');
+		$renderer->setClient(1);
 
-		return implode($html);
+		return $renderer->render($data);
 	}
 }

administrator/components/com_categories/categories.xml

@@ -19,6 +19,7 @@
 			<folder>forms</folder>
 			<folder>Helper</folder>
 			<folder>helpers</folder>
+			<folder>layouts</folder>
 			<folder>Model</folder>
 			<folder>Table</folder>
 			<folder>tmpl</folder>

administrator/components/com_categories/forms/category.xml

@@ -28,7 +28,6 @@
 
 	<field
 		name="parent_id"
-		class="advancedSelect"
 		type="categoryedit"
 		label="COM_CATEGORIES_FIELD_PARENT_LABEL"
 	/>

administrator/components/com_categories/forms/filter_categories.xml

@@ -44,6 +44,7 @@
 			type="tag"
 			label="JOPTION_SELECT_TAG"
 			mode="nested"
+			custom="false"
 			onchange="this.form.submit();"
 			>
 			<option value="">JOPTION_SELECT_TAG</option>

administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php

@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+$html    = array();
+$classes = array();
+$attr    = '';
+$attr2   = '';
+
+// Initialize some field attributes.
+$attr .= !empty($size) ? ' size="' . $size . '"' : '';
+$attr .= $multiple ? ' multiple' : '';
+$attr .= $autofocus ? ' autofocus' : '';
+$attr .= $onchange ? ' onchange="' . $onchange . '"' : '';
+
+// To avoid user's confusion, readonly="true" should imply disabled="disabled".
+if ($readonly || $disabled)
+{
+	$attr .= ' disabled="disabled"';
+}
+
+$attr2 .= !empty($class) ? ' class="' . $class . '"' : '';
+$attr2 .= ' search-placeholder="' . $this->escape(Text::_('JGLOBAL_TYPE_OR_SELECT_CATEGORY')) . '" ';
+
+if ($allowCustom)
+{
+	$attr2 .= ' allow-custom';
+}
+
+if ($required)
+{
+	$attr  .= ' required class="required"';
+	$attr2 .= ' required';
+}
+
+// Create a read-only list (no name) with hidden input(s) to store the value(s).
+if ($readonly)
+{
+	$html[] = HTMLHelper::_('select.genericlist', $options, '', trim($attr), 'value', 'text', $value, $id);
+
+	// E.g. form field type tag sends $this->value as array
+	if ($multiple && is_array($value))
+	{
+		if (!count($value))
+		{
+			$value[] = '';
+		}
+
+		foreach ($value as $val)
+		{
+			$html[] = '<input type="hidden" name="' . $name . '" value="' . htmlspecialchars($val, ENT_COMPAT, 'UTF-8') . '">';
+		}
+	}
+	else
+	{
+		$html[] = '<input type="hidden" name="' . $name . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '">';
+	}
+}
+else
+{
+	// Create a regular list.
+	if (count($options) === 0)
+	{
+		// All Categories have been deleted, so we need a new category (This will create on save if selected).
+		$options[0]            = new \stdClass;
+		$options[0]->value     = 'Uncategorised';
+		$options[0]->text      = 'Uncategorised';
+		$options[0]->level     = '1';
+		$options[0]->published = '1';
+		$options[0]->lft       = '1';
+	}
+
+	$html[] = HTMLHelper::_('select.genericlist', $options, $name, trim($attr), 'value', 'text', $value, $id);
+}
+
+Text::script('JGLOBAL_SELECT_NO_RESULTS_MATCH');
+Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
+
+Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
+HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
+
+?>
+
+<joomla-field-fancy-select <?php echo $attr2; ?>><?php echo implode($html); ?></joomla-field-fancy-select>

administrator/components/com_categories/tmpl/category/edit.php

@@ -18,7 +18,6 @@
 
 HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('behavior.keepalive');
-HTMLHelper::_('formbehavior.chosen', '.advancedSelect');
 
 $app = Factory::getApplication();
 $input = $app->input;

administrator/components/com_config/tmpl/component/default.php

@@ -27,7 +27,6 @@
 HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('behavior.keepalive');
 HTMLHelper::_('behavior.tabstate');
-HTMLHelper::_('formbehavior.chosen', '.chosen-custom-value', null, array('disable_search_threshold' => 0));
 
 // @TODO delete this when custom elements modal is merged
 HTMLHelper::_('script', 'com_config/admin-application-default.min.js', ['version' => 'auto', 'relative' => true]);

administrator/components/com_contact/tmpl/contact/edit.php

@@ -18,7 +18,6 @@
 
 HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('behavior.keepalive');
-HTMLHelper::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
 
 $app = Factory::getApplication();
 $input = $app->input;