jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379704 )
Change subject: Avoid hooking into EditPage's editFormTextTop and
editFormTextBottom
......................................................................
Avoid hooking into EditPage's editFormTextTop and editFormTextBottom
Wrapping the edit form with a <div> is a bit fragile, so replace the two
classes with something more robust.
Set 'mw-twocolconflict-page' on <body> and use that as a CSS selector
for increased specificity and ensuring it only applies to pages that are
TwoColConflict ones.
Next, instead of adding a mw-twocolconflict-before-base-selection class
in PHP and removing it once the base selection has been picked, look for
the absence of mw-twocolconflict-after-base-selection class with :not()
and add the class after the base selection is picked.
Change-Id: I8b37ef6459d29b93af79333e1814a856c9d5a36a
---
M includes/TwoColConflictPage.php
M modules/ext.TwoColConflict.BaseVersionSelector.css
M modules/ext.TwoColConflict.init.js
M modules/ext.TwoColConflict.less
4 files changed, 5 insertions(+), 7 deletions(-)
Approvals:
WMDE-Fisch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index 5cdafb5..266b936 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -48,9 +48,6 @@
$this->addCSS();
$this->addJS();
$this->deactivateWikEd();
- $this->editFormTextTop =
- '<div class="mw-twocolconflict-form
mw-twocolconflict-before-base-selection">';
- $this->editFormTextBottom = '</div>';
$this->editFormTextBeforeContent =
$this->addEditFormBeforeContent();
$this->editFormTextAfterContent =
$this->addEditFormAfterContent();
}
@@ -624,6 +621,7 @@
$out->addJsConfigVars( 'wgTwoColConflictSubmitLabel',
$this->context->msg( $this->getSubmitButtonLabel()
)->text()
);
+ $out->addBodyClasses( [ 'mw-twocolconflict-page' ] );
$out->addModules( [
'ext.TwoColConflict.initJs',
diff --git a/modules/ext.TwoColConflict.BaseVersionSelector.css
b/modules/ext.TwoColConflict.BaseVersionSelector.css
index a4fc7e2..328b2b5 100644
--- a/modules/ext.TwoColConflict.BaseVersionSelector.css
+++ b/modules/ext.TwoColConflict.BaseVersionSelector.css
@@ -1,5 +1,5 @@
/* stylelint-disable-next-line selector-no-id */
-.mw-twocolconflict-before-base-selection #wpTextbox1 {
+#wpTextbox1:not( .mw-twocolconflict-after-base-selection ) {
-webkit-filter: blur( 5px );
-moz-filter: blur( 5px );
-o-filter: blur( 5px );
diff --git a/modules/ext.TwoColConflict.init.js
b/modules/ext.TwoColConflict.init.js
index c436404..87b0517 100644
--- a/modules/ext.TwoColConflict.init.js
+++ b/modules/ext.TwoColConflict.init.js
@@ -159,7 +159,7 @@
function afterBaseVersionSelection() {
enableEditButtons();
- $( '.mw-twocolconflict-form' ).removeClass(
'mw-twocolconflict-before-base-selection' );
+ $( '#wpTextbox1' ).addClass(
'mw-twocolconflict-after-base-selection' );
redrawPage();
autoScroll.scrollToFirstOwnOrConflict();
$( '.mw-twocolconflict-changes-editor' ).focus();
diff --git a/modules/ext.TwoColConflict.less b/modules/ext.TwoColConflict.less
index f13d7b2..c28f95c 100644
--- a/modules/ext.TwoColConflict.less
+++ b/modules/ext.TwoColConflict.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-.mw-twocolconflict-form form {
+.mw-twocolconflict-page form {
display: -webkit-flex;
display: -moz-flex;
display: -ms-flex;
@@ -69,7 +69,7 @@
padding: 5px 0 5px 0;
}
-.mw-twocolconflict-form .editOptions {
+.mw-twocolconflict-page .editOptions {
border-top: 1px solid #c0c0c0;
margin-top: 1em;
}
--
To view, visit https://gerrit.wikimedia.org/r/379704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b37ef6459d29b93af79333e1814a856c9d5a36a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Andrew-WMDE <andrew.kos...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
