Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228138
Change subject: [WIP] Fix undo-edit-header
......................................................................
[WIP] Fix undo-edit-header
Bug: T107232
Change-Id: I8da16de5a51bfc14358272342ab81d324dc87d86
---
M FlowActions.php
M includes/Formatter/RevisionUndoViewFormatter.php
M includes/View.php
3 files changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/38/228138/1
diff --git a/FlowActions.php b/FlowActions.php
index 71efa05..25796e1 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -106,7 +106,7 @@
'handler-class' => 'Flow\Actions\FlowAction',
'editcount' => true,
// theis modules/moduleStyles is repeated in all the undo-*
actions. Find a way to share.
- 'modules' => array( 'ext.flow.undo' ),
+// 'modules' => array( 'ext.flow.undo' ),
'moduleStyles' => array(
'mediawiki.ui.button',
'mediawiki.ui.input',
diff --git a/includes/Formatter/RevisionUndoViewFormatter.php
b/includes/Formatter/RevisionUndoViewFormatter.php
index 3228e16..da6a6d1 100644
--- a/includes/Formatter/RevisionUndoViewFormatter.php
+++ b/includes/Formatter/RevisionUndoViewFormatter.php
@@ -48,9 +48,6 @@
'diff_content' =>
$differenceEngine->getDiffBody(),
),
'articleTitle' => $start->workflow->getArticleTitle(),
- // overrides the default modules list to only pull in
ext.flow.undo
- 'modules' => array( 'ext.flow.undo' ),
- 'moduleStyles' => array( 'ext.flow.undo.styles' ),
);
}
diff --git a/includes/View.php b/includes/View.php
index db445d2..9c8e380 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -81,7 +81,7 @@
protected function addModules( OutputPage $out, $action ) {
if ( $this->actions->hasValue( $action, 'modules' ) ) {
- $out->addModuleStyles( $this->actions->getValue(
$action, 'modules' ) );
+ $out->addModules( $this->actions->getValue( $action,
'modules' ) );
} else {
$out->addModules( array( 'ext.flow' ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/228138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8da16de5a51bfc14358272342ab81d324dc87d86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
