jenkins-bot has submitted this change and it was merged.
Change subject: LivePreview: Wrap content preview with mw-content-*
......................................................................
LivePreview: Wrap content preview with mw-content-*
The content container is needed for CSS selectors based on the direction
of the page content language.
Bug: T85531
Change-Id: I78f6b82972621da8dddc24f0d6d6b2293f7d8876
---
M includes/EditPage.php
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
2 files changed, 12 insertions(+), 13 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/EditPage.php b/includes/EditPage.php
index f5d98a7..0d5e63c 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2992,6 +2992,12 @@
if ( $this->formtype == 'preview' ) {
$this->showPreview( $previewOutput );
+ } else {
+ // Empty content container for LivePreview
+ $pageViewLang = $this->mTitle->getPageViewLanguage();
+ $attribs = array( 'lang' =>
$pageViewLang->getHtmlCode(), 'dir' => $pageViewLang->getDir(),
+ 'class' => 'mw-content-' .
$pageViewLang->getDir() );
+ $wgOut->addHTML( Html::rawElement( 'div', $attribs ) );
}
$wgOut->addHTML( '</div>' );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index e4ccf2b..7e7fe91 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -109,7 +109,7 @@
}
request = api.post( postData );
request.done( function ( response ) {
- var li, newList, $next, $parent, $list;
+ var li, newList, $content, $parent, $list;
if ( response.parse.modules ) {
mw.loader.load(
response.parse.modules.concat(
response.parse.modulescripts,
@@ -163,23 +163,16 @@
}
if ( response.parse.text['*'] ) {
- $next = $wikiPreview.next();
- // If there is no next node, use parent
instead.
- // Only query parent if needed, false
otherwise.
- $parent = !$next.length &&
$wikiPreview.parent();
-
- $wikiPreview
+ $content = $wikiPreview.children(
'.mw-content-ltr,.mw-content-rtl' );
+ $content
.detach()
.html( response.parse.text['*']
);
- mw.hook( 'wikipage.content' ).fire(
$wikiPreview );
+ mw.hook( 'wikipage.content' ).fire(
$content );
// Reattach
- if ( $parent ) {
- $parent.append( $wikiPreview );
- } else {
- $next.before( $wikiPreview );
- }
+ $wikiPreview.append( $content );
+
$wikiPreview.show();
}
--
To view, visit https://gerrit.wikimedia.org/r/182293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78f6b82972621da8dddc24f0d6d6b2293f7d8876
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: Cacycle <cacycl...@gmail.com>
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
Gerrit-Reviewer: Helder.wiki <helder.w...@gmail.com>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: Tpt <thoma...@hotmail.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
