Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Merge away mediawiki.ForeignStructuredUpload module"

Browse source
This commit is contained in:
jenkins-bot 2022-07-06 18:49:47 +00:00 committed by Gerrit Code Review
commit 6b3afa8ca3
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
resources/Resources.php
View file

@ -1076,20 +1076,6 @@ return [
'upload-foreign-cant-upload',
]
],
'mediawiki.ForeignStructuredUpload' => [
'localBasePath' => "$wgBaseDirectory/resources/src",
'remoteBasePath' => "$wgResourceBasePath/resources/src",
'packageFiles' => [
'mediawiki.ForeignStructuredUpload.js',
[ 'name' => 'config.json', 'config' => [ MainConfigNames::UploadDialog ] ],
],
'dependencies' => [
'mediawiki.ForeignUpload',
],
'messages' => [
'upload-foreign-cant-load-config',
],
],
'mediawiki.Upload.Dialog' => [
'scripts' => [
'resources/src/mediawiki.Upload.Dialog.js',
@ -1157,9 +1143,16 @@ return [
],
],
'mediawiki.ForeignStructuredUpload.BookletLayout' => [
'scripts' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js',
'localBasePath' => "$wgBaseDirectory/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout",
'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout",
'packageFiles' => [
"index.js",
'ForeignStructuredUpload.js',
[ 'name' => 'config.json', 'config' => [ MainConfigNames::UploadDialog ] ],
"BookletLayout.js",
],
'dependencies' => [
'mediawiki.ForeignStructuredUpload',
'mediawiki.ForeignUpload',
'mediawiki.Upload.BookletLayout',
'mediawiki.widgets.CategoryMultiselectWidget',
'mediawiki.widgets.DateInputWidget',
@ -1169,6 +1162,7 @@ return [
'mediawiki.libs.jpegmeta',
],
'messages' => [
'upload-foreign-cant-load-config',
'upload-form-label-own-work',
'upload-form-label-infoform-categories',
'upload-form-label-infoform-date',

0
resources/src/mediawiki.ForeignStructuredUpload.js → resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/ForeignStructuredUpload.js
View file

7
resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/index.js Normal file
View file

@ -0,0 +1,7 @@
/*
* Make sure that the upload code loads before the booklet, since the upload code creates
* mw.ForeignStructuredUpload and the booklet creates mw.ForeignStructuredUpload.BookletLayout,
* requiring that the object mw.ForeignStructuredUpload be defined first.
*/
require( './ForeignStructuredUpload.js' );
require( './BookletLayout.js' );