jenkins-bot has submitted this change and it was merged.
Change subject: Separate out resources for media search widget
......................................................................
Separate out resources for media search widget
Make this new modules a direct dependency of mwgallery so
that galleries work even if mwimage isn't loaded (e.g. mobile)
Bug: T150840
Change-Id: I7f1d9fe0c0133abe5cd56c1e5e34b93d9edde9bc
---
M extension.json
1 file changed, 25 insertions(+), 8 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 0109ef5..17f8d3b 100644
--- a/extension.json
+++ b/extension.json
@@ -1328,15 +1328,34 @@
"mobile"
]
},
- "ext.visualEditor.mwimage": {
+ "ext.visualEditor.mwmediasearch": {
"scripts": [
- "modules/ve-mw/dm/models/ve.dm.MWImageModel.js",
"modules/ve-mw/dm/models/ve.dm.MWMediaResourceProvider.js",
"modules/ve-mw/dm/models/ve.dm.MWMediaSearchProvider.js",
"modules/ve-mw/dm/models/ve.dm.MWMediaResourceQueue.js",
"modules/ve-mw/dm/models/ve.dm.MWMediaSearchQueue.js",
"modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js",
-
"modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js",
+
"modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js"
+ ],
+ "styles": [
+
"modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaSearchWidget.css",
+
"modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css"
+ ],
+ "dependencies": [
+ "mediawiki.ForeignApi"
+ ],
+ "messages": [
+ "visualeditor-dialog-media-noresults",
+ "visualeditor-media-input-placeholder"
+ ],
+ "targets": [
+ "desktop",
+ "mobile"
+ ]
+ },
+ "ext.visualEditor.mwimage": {
+ "scripts": [
+ "modules/ve-mw/dm/models/ve.dm.MWImageModel.js",
"modules/ve-mw/ui/widgets/ve.ui.MWMediaInfoFieldWidget.js",
"modules/ve-mw/ui/datatransferhandlers/ve.ui.MWMediaTransferHandler.js",
"modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js",
@@ -1344,12 +1363,11 @@
],
"styles": [
"modules/ve-mw/ui/styles/dialogs/ve.ui.MWMediaDialog.css",
-
"modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaSearchWidget.css",
-
"modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaResultWidget.css",
"modules/ve-mw/ui/styles/widgets/ve.ui.MWMediaInfoFieldWidget.css"
],
"dependencies": [
"ext.visualEditor.mwimage.core",
+ "ext.visualEditor.mwmediasearch",
"oojs-ui.styles.icons-interactions",
"oojs-ui.styles.icons-media",
"oojs-ui.styles.icons-wikimedia",
@@ -1379,7 +1397,6 @@
"visualeditor-dialog-media-info-readmore",
"visualeditor-dialog-media-info-separator",
"visualeditor-dialog-media-info-uploaded",
- "visualeditor-dialog-media-noresults",
"visualeditor-dialog-media-originaldimensions",
"visualeditor-dialog-media-page-advanced",
"visualeditor-dialog-media-page-general",
@@ -1408,8 +1425,7 @@
"visualeditor-dialog-media-type-section-help",
"visualeditor-dialog-media-type-thumb",
"visualeditor-dialog-media-upload",
- "visualeditor-dialogbutton-media-tooltip",
- "visualeditor-media-input-placeholder"
+ "visualeditor-dialogbutton-media-tooltip"
],
"targets": [
"desktop"
@@ -1778,6 +1794,7 @@
],
"dependencies": [
"ext.visualEditor.mwcore",
+ "ext.visualEditor.mwmediasearch",
"oojs-ui.styles.icons-media",
"mediawiki.page.gallery.styles"
],
--
To view, visit https://gerrit.wikimedia.org/r/321882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f1d9fe0c0133abe5cd56c1e5e34b93d9edde9bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: DLynch <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
