wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 03:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Apply pre-save transform to template previews"

Browse source
This commit is contained in:
jenkins-bot 2014-10-27 18:38:40 +00:00 committed by Gerrit Code Review
parent 20b20bc97c 36060a2782
commit 4e8cf83265
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ApiVisualEditor.php
View file

@ -163,6 +163,16 @@ class ApiVisualEditor extends ApiBase {
);
}
protected function pstWikitext( $title, $wikitext ) {
return ContentHandler::makeContent( $wikitext, $title )
->preSaveTransform(
$title,
$this->getUser(),
WikiPage::factory( $title )->makeParserOptions( $this->getContext() )
)
->serialize( 'text/x-wiki' );
}
protected function parseWikitextFragment( $title, $wikitext ) {
return $this->requestParsoid( 'POST', $title,
array(
@ -213,13 +223,7 @@ class ApiVisualEditor extends ApiBase {
'action' => 'query',
'prop' => 'revisions',
'titles' => $title->getPrefixedDBkey(),
'rvdifftotext' => ContentHandler::makeContent( $wikitext, $title )
->preSaveTransform(
$title,
$this->getUser(),
WikiPage::factory( $title )->makeParserOptions( $this->getContext() )
)
->serialize( 'text/x-wiki' )
'rvdifftotext' => $this->pstWikitext( $title, $wikitext )
);
$api = new ApiMain(
new DerivativeRequest(
@ -473,7 +477,11 @@ class ApiVisualEditor extends ApiBase {
break;
case 'parsefragment':
$content = $this->parseWikitextFragment( $page, $params['wikitext'] );
$wikitext = $params['wikitext'];
if ( $params['pst'] ) {
$wikitext = $this->pstWikitext( $page, $wikitext );
}
$content = $this->parseWikitextFragment( $page, $wikitext );
if ( $content === false ) {
$this->dieUsage( 'Error contacting the Parsoid server', 'parsoidserver' );
} else {
@ -594,6 +602,7 @@ class ApiVisualEditor extends ApiBase {
'oldid' => null,
'html' => null,
'cachekey' => null,
'pst' => false,
);
}
@ -618,7 +627,9 @@ class ApiVisualEditor extends ApiBase {
'page' => 'The page to perform actions on.',
'paction' => 'Action to perform',
'oldid' => 'The revision number to use (defaults to latest version).',
'html' => 'HTML to send to parsoid in exchange for wikitext',
'html' => 'HTML to send to Parsoid to convert to wikitext',
'wikitext' => 'Wikitext to send to Parsoid to convert to HTML (paction=parsefragment)',
'pst' => 'Pre-save transform wikitext before sending it to Parsoid (paction=parsefragment)',
'basetimestamp' => 'When saving, set this to the timestamp of the revision that was'
. ' edited. Used to detect edit conflicts.',
'starttimestamp' => 'When saving, set this to the timestamp of when the page was loaded.'

3
modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
View file

@ -80,7 +80,8 @@ ve.ce.MWTransclusionNode.prototype.generateContents = function ( config ) {
action: 'visualeditor',
paction: 'parsefragment',
page: mw.config.get( 'wgRelevantPageName' ),
wikitext: ( config && config.wikitext ) || this.model.getWikitext()
wikitext: ( config && config.wikitext ) || this.model.getWikitext(),
pst: 1
}, { type: 'POST' } )
.done( this.onParseSuccess.bind( this, deferred ) )
.fail( this.onParseError.bind( this, deferred ) );