jenkins-bot has submitted this change and it was merged.
Change subject: Surface upload libraries as RL modules
......................................................................
Surface upload libraries as RL modules
The PronunciationRecording tool in particular really wants
to be able to use the UploadWizard upload mechanisms, so we
have them as separate modules now.
Follow-up patch to come that loads them dynamically.
Bug: 49991
Change-Id: I4047426b5ca138a6677b25f02ba31603152ea8dd
---
M UploadWizard.php
M UploadWizardHooks.php
2 files changed, 29 insertions(+), 8 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizard.php b/UploadWizard.php
index e44a7dc..3699ad9 100644
--- a/UploadWizard.php
+++ b/UploadWizard.php
@@ -70,6 +70,32 @@
$wgHooks['LoadExtensionSchemaUpdates'][] = 'UploadWizardHooks::onSchemaUpdate';
$wgHooks['GetPreferences'][] = 'UploadWizardHooks::onGetPreferences';
+$uploadWizardModuleInfo = array(
+ 'localBasePath' => __DIR__ . '/resources',
+ 'remoteExtPath' => 'UploadWizard/resources',
+);
+
+$wgResourceModules['ext.uploadWizard.formDataTransport'] = array(
+ 'scripts' => 'mw.FormDataTransport.js',
+) + $uploadWizardModuleInfo;
+
+$wgResourceModules['ext.uploadWizard.iFrameTransport'] = array(
+ 'scripts' => 'mw.IframeTransport.js',
+) + $uploadWizardModuleInfo;
+
+$wgResourceModules['ext.uploadWizard.apiUploadHandler'] = array(
+ 'scripts' => 'mw.ApiUploadHandler.js',
+ 'dependencies' => 'ext.uploadWizard.iFrameTransport',
+ 'messages' => 'mwe-upwiz-transport-started',
+) + $uploadWizardModuleInfo;
+
+//upload using FormData, large files in chunks
+$wgResourceModules['ext.uploadWizard.apiUploadFormDataHandler'] = array(
+ 'scripts' => 'mw.ApiUploadFormDataHandler.js',
+ 'dependencies' => 'ext.uploadWizard.formDataTransport',
+ 'messages' => 'mwe-upwiz-transport-started',
+) + $uploadWizardModuleInfo;
+
// Campaign hook handlers
$wgHooks[ 'BeforePageDisplay' ][] = 'CampaignHooks::onBeforePageDisplay';
$wgHooks[ 'EditFilterMerged' ][] = 'CampaignHooks::onEditFilterMerged';
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index add783d..83e4b65 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -37,7 +37,9 @@
'mediawiki.api.parse',
'mediawiki.Title',
'mediawiki.user',
- 'mediawiki.feedback'
+ 'mediawiki.feedback',
+ 'ext.uploadWizard.apiUploadHandler',
+ 'ext.uploadWizard.apiUploadFormDataHandler'
),
'scripts' => array(
// jquery interface helpers
@@ -66,8 +68,6 @@
'resources/mw.LanguageUpWiz.js',
// workhorse libraries
- 'resources/mw.IframeTransport.js',
- 'resources/mw.ApiUploadHandler.js',
'resources/mw.DestinationChecker.js',
'resources/mw.UploadWizardUtil.js',
@@ -78,10 +78,6 @@
// flickr libraries
'resources/mw.FlickrChecker.js',
-
- //upload using FormData, large files in chunks
- 'resources/mw.FormDataTransport.js',
- 'resources/mw.ApiUploadFormDataHandler.js',
// interface libraries
'resources/mw.GroupProgressBar.js',
@@ -173,7 +169,6 @@
'mwe-upwiz-flickr-disclaimer1',
'mwe-upwiz-flickr-disclaimer2',
'mwe-upwiz-browse',
- 'mwe-upwiz-transport-started',
'mwe-upwiz-encoding',
'mwe-upwiz-uploading',
'mwe-upwiz-queued',
--
To view, visit https://gerrit.wikimedia.org/r/79547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4047426b5ca138a6677b25f02ba31603152ea8dd
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Rahul21 <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
