[5.2] Media field: selectable folders

administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js

@@ -126,6 +126,7 @@ export default {
             bubbles: true,
             cancelable: false,
             detail: {
+              type: this.item.type,
               path: this.item.path,
               thumb: this.item.thumb,
               fileType: this.item.mime_type ? this.item.mime_type : false,
@@ -142,7 +143,10 @@ export default {
           new CustomEvent('onMediaFileSelected', {
             bubbles: true,
             cancelable: false,
-            detail: {},
+            detail: {
+              type: this.item.type,
+              path: this.item.path,
+            },
           }),
         );
       }

administrator/components/com_media/resources/scripts/components/browser/table/row.vue

@@ -136,32 +136,31 @@ export default {
      * @param event
      */
     onClick(event) {
-      const path = false;
       const data = {
-        path,
+        path: this.item.path,
+        type: this.item.type,
         thumb: false,
         fileType: this.item.mime_type ? this.item.mime_type : false,
         extension: this.item.extension ? this.item.extension : false,
       };
 
       if (this.item.type === 'file') {
-        data.path = this.item.path;
         data.thumb = this.item.thumb ? this.item.thumb : false;
         data.width = this.item.width ? this.item.width : 0;
         data.height = this.item.height ? this.item.height : 0;
-
-        window.parent.document.dispatchEvent(
-          new CustomEvent(
-            'onMediaFileSelected',
-            {
-              bubbles: true,
-              cancelable: false,
-              detail: data,
-            },
-          ),
-        );
       }
 
+      window.parent.document.dispatchEvent(
+        new CustomEvent(
+          'onMediaFileSelected',
+          {
+            bubbles: true,
+            cancelable: false,
+            detail: data,
+          },
+        ),
+      );
+
       // Handle clicks when the item was not selected
       if (!this.isSelected()) {
         // Unselect all other selected items,

build/media_source/system/js/fields/joomla-field-media.w-c.es6.js

@@ -39,12 +39,12 @@ class JoomlaFieldMedia extends HTMLElement {
   }
 
   static get observedAttributes() {
-    return ['type', 'base-path', 'root-folder', 'url', 'modal-title', 'modal-width', 'modal-height', 'input', 'button-select', 'button-clear', 'preview', 'preview-width', 'preview-height'];
+    return ['base-path', 'root-folder', 'url', 'modal-title', 'modal-width', 'modal-height', 'input', 'button-select', 'button-clear', 'preview', 'preview-width', 'preview-height'];
   }
 
-  get type() { return this.getAttribute('type'); }
+  get types() { return this.getAttribute('types') || ''; }
 
-  set type(value) { this.setAttribute('type', value); }
+  set types(value) { this.setAttribute('types', value); }
 
   get basePath() { return this.getAttribute('base-path'); }
 
@@ -175,7 +175,12 @@ class JoomlaFieldMedia extends HTMLElement {
 
   async modalClose() {
     try {
-      await Joomla.getMedia(Joomla.selectedMediaFile, this.inputElement, this);
+      const item = Joomla.selectedMediaFile;
+      if (item && item.type === 'dir' && this.types.includes('directories')) {
+        this.setValue(item.path);
+      } else {
+        await Joomla.getMedia(Joomla.selectedMediaFile, this.inputElement, this);
+      }
     } catch (err) {
       Joomla.renderMessages({
         error: [Joomla.Text._('JLIB_APPLICATION_ERROR_SERVER')],

layouts/joomla/form/field/media.php

@@ -40,7 +40,8 @@
  * @var  integer  $size            The size text
  * @var  string   $value           The value text
  * @var  string   $src             The path and filename of the image
- * @var  array    $mediaTypes      The supported media types for the Media Manager
+ * @var  string   $mediaTypes      The ids of supported media types for the Media Manager
+ * @var  array    $mediaTypeNames  The names of supported media types for the Media Manager
  * @var  array    $imagesExt       The supported extensions for images
  * @var  array    $audiosExt       The supported extensions for audios
  * @var  array    $videosExt       The supported extensions for videos
@@ -155,7 +156,8 @@
 }
 
 ?>
-<joomla-field-media class="field-media-wrapper" type="image" <?php // @TODO add this attribute to the field in order to use it for all media types ?>
+<joomla-field-media class="field-media-wrapper"
+    types="<?php echo $this->escape(implode(',', $mediaTypeNames)); ?>"
     base-path="<?php echo $this->escape(Uri::root()); ?>"
     root-folder="<?php echo $this->escape(ComponentHelper::getParams('com_media')->get('file_path', 'images')); ?>"
     url="<?php echo $url; ?>"

libraries/src/Form/Field/MediaField.php

@@ -382,6 +382,9 @@ public function getLayoutData()
         array_map(
             function ($mediaType) use (&$types, &$imagesAllowedExt, &$audiosAllowedExt, &$videosAllowedExt, &$documentsAllowedExt, $imagesExt, $audiosExt, $videosExt, $documentsExt) {
                 switch ($mediaType) {
+                    case 'directories':
+                        $types[] = '-1';
+                        break;
                     case 'images':
                         $types[]          = '0';
                         $imagesAllowedExt = $imagesExt;
@@ -417,6 +420,7 @@ function ($mediaType) use (&$types, &$imagesAllowedExt, &$audiosAllowedExt, &$vi
             'previewHeight'       => $this->previewHeight,
             'previewWidth'        => $this->previewWidth,
             'mediaTypes'          => implode(',', $types),
+            'mediaTypeNames'      => $mediaTypes,
             'imagesExt'           => $imagesExt,
             'audiosExt'           => $audiosExt,
             'videosExt'           => $videosExt,

plugins/fields/media/params/media.xml

@@ -4,12 +4,10 @@
 		<fieldset name="fieldparams">
 			<field
 				name="directory"
-				type="folderlist"
+				type="media"
 				label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
-				directory="images"
-				hide_none="true"
-				recursive="true"
-				validate="options"
+				preview="false"
+				types="directories"
 			/>
 
 			<field