jenkins-bot has submitted this change and it was merged.
Change subject: Do not use addModuleStyles in ext.flow.mediawiki.ui.tooltips
and ext.flow.mediawiki.ui.modal
......................................................................
Do not use addModuleStyles in ext.flow.mediawiki.ui.tooltips and
ext.flow.mediawiki.ui.modal
Bug: T97467
Change-Id: Ia592ee3132249665a565fc2fcdedd0810d741b10
---
M Resources.php
M includes/View.php
M modules/contributions/base.js
3 files changed, 5 insertions(+), 17 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 2432f64..781996c 100644
--- a/Resources.php
+++ b/Resources.php
@@ -257,13 +257,6 @@
),
) + $mobile,
// @todo: upstream to mediawiki ui
- 'ext.flow.mediawiki.ui.modal' => $flowResourceTemplate + array(
- 'position' => 'top',
- 'styles' => array(
- 'styles/mediawiki.ui/modal.less',
- ),
- ) + $mobile,
- // @todo: upstream to mediawiki ui
'ext.flow.mediawiki.ui.text' => $flowResourceTemplate + array(
'position' => 'top',
'styles' => array(
@@ -275,13 +268,6 @@
'position' => 'top',
'styles' => array(
'styles/mediawiki.ui/forms.less',
- ),
- ) + $mobile,
- // @todo: upstream to mediawiki ui
- 'ext.flow.mediawiki.ui.tooltips' => $flowResourceTemplate + array(
- 'position' => 'top',
- 'styles' => array(
- 'styles/mediawiki.ui/tooltips.less',
),
) + $mobile,
'ext.flow.styles.base' => $flowResourceTemplate + array(
@@ -449,6 +435,10 @@
) + $mobile,
'ext.flow' => $flowResourceTemplate + array(
'position' => 'top',
+ 'styles' => array(
+ 'styles/mediawiki.ui/modal.less',
+ 'styles/mediawiki.ui/tooltips.less'
+ ),
'scripts' => array( // Component order is important
// MW UI
'engine/misc/mw-ui.enhance.js',
diff --git a/includes/View.php b/includes/View.php
index fc24dab..bc164de 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -97,9 +97,7 @@
'mediawiki.ui.icon',
'mediawiki.ui.text',
'ext.flow.styles.base' ,
- 'ext.flow.mediawiki.ui.tooltips',
'ext.flow.mediawiki.ui.form',
- 'ext.flow.mediawiki.ui.modal',
'ext.flow.mediawiki.ui.text',
'oojs-ui.styles.icons',
'oojs-ui.styles.icons-layout',
diff --git a/modules/contributions/base.js b/modules/contributions/base.js
index b2d4486..3f6ad96 100644
--- a/modules/contributions/base.js
+++ b/modules/contributions/base.js
@@ -19,7 +19,7 @@
// If that failed still run the onComplete, it will not trigger
// our handler and be a normal click this time.
mw.loader.using(
- [ 'ext.flow', 'ext.flow.mediawiki.ui.modal',
'mediawiki.ui.input' ],
+ [ 'ext.flow', 'mediawiki.ui.input' ],
onComplete,
onComplete
);
--
To view, visit https://gerrit.wikimedia.org/r/263212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia592ee3132249665a565fc2fcdedd0810d741b10
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: MtDu <[email protected]>
Gerrit-Reviewer: Aklapper <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: MtDu <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
