Skip to content

[4.1] Remove invalid tooltip option in media field #37115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2022
Merged

[4.1] Remove invalid tooltip option in media field #37115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
936ed17
[4.1] Media Fields
brianteeman Feb 22, 2022
556c113
Merge branch '4.1-dev' into media_field
brianteeman Apr 1, 2022
be2d644
Merge branch '4.1-dev' into media_field
Apr 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion administrator/language/en-GB/plg_fields_media.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL="Directory"
PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_LABEL="Image Class"
PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE="Inline"
PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL="Preview"
PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP="Tooltip"
PLG_FIELDS_MEDIA_XML_DESCRIPTION="This plugin lets you create new fields of type 'media' in any extensions where custom fields are supported."
4 changes: 2 additions & 2 deletions plugins/fields/media/media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ public function onCustomFieldsPrepareDom($field, DOMElement $parent, Form $form)
}

$fieldNode->setAttribute('type', 'accessiblemedia');

if (Factory::getApplication()->getIdentity()->authorise('core.create', 'com_media'))
{
$fieldNode->setAttribute('disabled', 'false');
}

return $fieldNode;
}

Expand Down
3 changes: 1 addition & 2 deletions plugins/fields/media/media.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@
type="list"
label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL"
class="list"
default="tooltip"
default="true"
validate="options"
>
<option value="tooltip">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP</option>
Copy link
Contributor

@Quy Quy Mar 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add // Deprecated parameter value?

joomla-cms/layouts/joomla/form/field/media.php

Line 70 in 4408a5f

case 'tooltip':

<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
<option value="false">JNO</option>
</field>
Expand Down
1 change: 0 additions & 1 deletion plugins/fields/media/params/media.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
validate="options"
>
<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
<option value="tooltip">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP</option>
<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
<option value="false">JNO</option>
</field>
Expand Down