Skip to content

Commit 6771518

Browse files
iriks-itiriks-it
authored
Merge pull request #40 from experius/feature/DOBO-786
[FEATURE][DOBO-786] Added bmp filetype, and Magento 2.4.7 compatibility
2 parents dc75554 + b25fcaa commit 6771518

File tree

4 files changed

+41
-12
lines changed

4 files changed

+41
-12
lines changed

‎Helper/Settings.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ public function getExtraFiletypes()
129129
'mp4',
130130
'ogg',
131131
'webm',
132+
'bmp'
132133
];
133134

134135
return array_merge($filetypes, $defaultFiletypes);

‎etc/adminhtml/di.xml‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" ?>
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
3-
<type name="Magento\Cms\Model\Wysiwyg\Images\Storage">
4-
<plugin name="Experius_WysiwygDownloads_Plugin_Magento_Cms_Model_Wysiwyg_Images_Storage"
3+
<type name="Magento\Cms\Model\Wysiwyg\Images\Storage">
4+
<plugin name="Experius_WysiwygDownloads_Plugin_Magento_Cms_Model_Wysiwyg_Images_Storage"
55
type="Experius\WysiwygDownloads\Plugin\Magento\Cms\Model\Wysiwyg\Images\Storage"
66
sortOrder="10" />
77
<arguments>
@@ -65,16 +65,25 @@
6565
</item>
6666
</argument>
6767
</arguments>
68-
</type>
68+
</type>
6969
<type name="Magento\MediaGalleryUi\Ui\Component\Control\UploadAssets">
7070
<plugin name="Experius_WysiwygDownloads_Plugin_Magento_MediaGalleryUi_Ui_Component_Control_UploadAssets"
7171
type="Experius\WysiwygDownloads\Plugin\Magento\MediaGalleryUi\Ui\Component\Control\UploadAssets"
7272
sortOrder="10"/>
7373
</type>
74-
<preference for="Magento\Framework\Image\Adapter\Gd2" type="Experius\WysiwygDownloads\Image\Adapter\Gd2" />
74+
<type name="Magento\MediaGalleryUi\Ui\Component\Listing\Columns\Url">
75+
<plugin name="Experius_WysiwygDownloads_Plugin_Magento_MediaGalleryUi_Ui_Component_Listing_Columns_Url"
76+
type="Experius\WysiwygDownloads\Plugin\Magento\MediaGalleryUi\Ui\Component\Listing\Columns\Url"
77+
sortOrder="10" disabled="false"/>
78+
</type>
79+
<preference for="Magento\Framework\Image\Adapter\Gd2" type="Experius\WysiwygDownloads\Image\Adapter\Gd2" />
7580
<type name="Magento\MediaGalleryIntegration\Plugin\SaveImageInformation">
7681
<arguments>
7782
<argument name="imageExtensions" xsi:type="array">
83+
<item name="jpg" xsi:type="string">jpg</item>
84+
<item name="jpeg" xsi:type="string">jpeg</item>
85+
<item name="gif" xsi:type="string">gif</item>
86+
<item name="png" xsi:type="string">png</item>
7887
<item name="pdf" xsi:type="string">pdf</item>
7988
<item name="svg" xsi:type="string">svg</item>
8089
</argument>
@@ -83,6 +92,22 @@
8392
<type name="Magento\MediaGalleryRenditions\Model\Queue\FetchRenditionPathsBatches">
8493
<arguments>
8594
<argument name="fileExtensions" xsi:type="array">
95+
<item name="jpg" xsi:type="string">jpg</item>
96+
<item name="jpeg" xsi:type="string">jpeg</item>
97+
<item name="gif" xsi:type="string">gif</item>
98+
<item name="png" xsi:type="string">png</item>
99+
<item name="pdf" xsi:type="string">pdf</item>
100+
<item name="svg" xsi:type="string">svg</item>
101+
</argument>
102+
</arguments>
103+
</type>
104+
<type name="Magento\MediaGallerySynchronization\Model\FetchMediaStorageFileBatches">
105+
<arguments>
106+
<argument name="fileExtensions" xsi:type="array">
107+
<item name="jpg" xsi:type="string">jpg</item>
108+
<item name="jpeg" xsi:type="string">jpeg</item>
109+
<item name="gif" xsi:type="string">gif</item>
110+
<item name="png" xsi:type="string">png</item>
86111
<item name="pdf" xsi:type="string">pdf</item>
87112
<item name="svg" xsi:type="string">svg</item>
88113
</argument>

‎etc/adminhtml/system.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<label>Extra Allowed Filetypes in the WYSIWYG-editor</label>
88
<frontend_model>Experius\WysiwygDownloads\Block\Adminhtml\System\Config\Form\Field\Filetypes</frontend_model>
99
<backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
10-
<comment><![CDATA[By default the following filetypes are available after installing this module 'doc','docm','docx','csv','xml','xls','xlsx','pdf','zip','tar']]></comment>
10+
<comment><![CDATA[By default the following filetypes are available after installing this module 'jpg', 'jpeg', 'png', 'gif', 'webp', 'svg', 'pdf', 'doc', 'docx', 'docm', 'odt', 'csv', 'txt', 'xml', 'xls', 'xlsx', 'ods', 'zip', 'tar', 'mp3', 'mp4', 'ogg', 'webm', 'bmp']]></comment>
1111
</field>
1212
</group>
1313
</section>

‎etc/module.xml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<?xml version="1.0" ?>
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
3-
<module name="Experius_WysiwygDownloads">
4-
<sequence>
5-
<module name="Magento_Cms"/>
6-
<module name="Magento_Config"/>
7-
<module name="Magento_Store"/>
8-
</sequence>
9-
</module>
3+
<module name="Experius_WysiwygDownloads">
4+
<sequence>
5+
<module name="Magento_Cms"/>
6+
<module name="Magento_Config"/>
7+
<module name="Magento_Store"/>
8+
<module name="MediaGalleryUi"/>
9+
<module name="MediaGalleryIntegration"/>
10+
<module name="MediaGallerySyncroization"/>
11+
</sequence>
12+
</module>
1013
</config>

0 commit comments

Comments
 (0)