Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "LivePreview: Wrap content preview with mw-content-*"

Browse source
This commit is contained in:
jenkins-bot 2015-02-28 14:47:53 +00:00 committed by Gerrit Code Review
commit 5e8a50dab4
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/EditPage.php
View file

@ -2996,6 +2996,12 @@ HTML
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>' );

19
resources/src/mediawiki.action/mediawiki.action.edit.preview.js
View file

@ -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();
}