Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/245961
Change subject: Media upload: Get allowed file extensions and mime types from
MW core
......................................................................
Media upload: Get allowed file extensions and mime types from MW core
Change-Id: I665ca269f2f7a45e835ec5e257acfb39278e3191
---
M VisualEditor.hooks.php
M modules/ve-mw/ui/datatransferhandlers/ve.ui.MWImageTransferHandler.js
2 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/61/245961/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 111cf8f..3d054ab 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -425,6 +425,18 @@
* Adds extra variables to the page config.
*/
public static function onMakeGlobalVariablesScript( array &$vars,
OutputPage $out ) {
+ global $wgFileExtensions;
+
+ $mimeTypes = array();
+
+ $magic = MimeMagic::singleton();
+ foreach ( $wgFileExtensions as $ext ) {
+ $typesForExt = $magic->getTypesForExtension( $ext );
+ if ( $typesForExt !== null ) {
+ $mimeTypes = array_merge( $mimeTypes, explode(
' ', $typesForExt ) );
+ }
+ }
+
$pageLanguage = $out->getTitle()->getPageLanguage();
$vars['wgVisualEditor'] = array(
@@ -432,6 +444,8 @@
'pageLanguageDir' => $pageLanguage->getDir(),
'usePageImages' => defined( 'PAGE_IMAGES_INSTALLED' ),
'usePageDescriptions' => defined( 'WBC_VERSION' ),
+ 'fileExtensions' => $wgFileExtensions,
+ 'mimeTypes' => $mimeTypes,
);
return true;
diff --git
a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWImageTransferHandler.js
b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWImageTransferHandler.js
index 8928c0b..29359f2 100644
--- a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWImageTransferHandler.js
+++ b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWImageTransferHandler.js
@@ -31,10 +31,9 @@
ve.ui.MWImageTransferHandler.static.kinds = [ 'file' ];
-// TODO: Pull available types and extensions from MW config
-ve.ui.MWImageTransferHandler.static.types = [ 'image/jpeg', 'image/png',
'image/gif', 'image/svg+xml' ];
+ve.ui.MWImageTransferHandler.static.types = mw.config.get( 'wgVisualEditor'
).mimeTypes;
-ve.ui.MWImageTransferHandler.static.extensions = [ 'jpg', 'jpeg', 'png',
'gif', 'svg' ];
+ve.ui.MWImageTransferHandler.static.extensions = mw.config.get(
'wgVisualEditor' ).fileExtensions;
/* Methods */
--
To view, visit https://gerrit.wikimedia.org/r/245961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I665ca269f2f7a45e835ec5e257acfb39278e3191
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
