wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 16:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Move preview document filtering into MWSaveDialog"

Browse source
This commit is contained in:
jenkins-bot 2017-06-21 00:41:26 +00:00 committed by Gerrit Code Review
parent def5a24959 9dd638a5ab
commit 115f8e7ae5
2 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/ve-mw/init/ve.init.mw.ArticleTarget.js
View file

@ -996,26 +996,19 @@ ve.init.mw.ArticleTarget.prototype.onSaveDialogPreview = function () {
wikitext: wikitext,
pst: true
} ).always( function ( response, details ) {
var doc, body,
var doc,
baseDoc = target.getSurface().getModel().getDocument().getHtmlDocument();
if ( ve.getProp( response, 'visualeditor', 'result' ) === 'success' ) {
doc = target.constructor.static.parseDocument( response.visualeditor.content, 'visual' );
body = doc.body;
// Import body to current document, then resolve attributes against original document (parseDocument called #fixBase)
document.adoptNode( body );
// TODO: This code is very similar to ve.ui.PreviewElement
ve.resolveAttributes( body, doc, ve.dm.Converter.static.computedAttributes );
ve.targetLinksToNewWindow( body );
target.saveDialog.showPreview( $( body ).contents(), baseDoc );
target.saveDialog.showPreview( doc, baseDoc );
} else {
target.saveDialog.showPreview(
$( '<em>' ).text( ve.msg(
ve.msg(
'visualeditor-loaderror-message',
ve.getProp( details, 'error', 'info' ) || 'Failed to connect'
) ),
baseDoc
)
);
}
target.bindSaveDialogClearDiff();

43
modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
View file

@ -175,15 +175,40 @@ ve.ui.MWSaveDialog.prototype.setDiffAndReview = function ( wikitextDiffPromise,
/**
* Set preview content and show preview panel.
*
* @param {jQuery} content Preview content
* @param {HTMLDocument} baseDoc Base document against which to normalise links
* @param {HTMLDocument|string} docOrMsg Document to preview, or error message
* @param {HTMLDocument} [baseDoc] Base document against which to normalise links, if document provided
*/
ve.ui.MWSaveDialog.prototype.showPreview = function ( content, baseDoc ) {
this.$previewViewer.empty().append( content );
// Run styles so links render with their appropriate classes
ve.init.platform.linkCache.styleParsoidElements( this.$previewViewer, baseDoc );
// Run hooks so other things can alter the document
mw.hook( 'wikipage.content' ).fire( this.$previewViewer );
ve.ui.MWSaveDialog.prototype.showPreview = function ( docOrMsg, baseDoc ) {
var body, contents;
if ( docOrMsg instanceof HTMLDocument ) {
body = docOrMsg.body;
// Import body to current document, then resolve attributes against original document (parseDocument called #fixBase)
document.adoptNode( body );
// TODO: This code is very similar to ve.ui.PreviewElement+ve.ui.MWPreviewElement
ve.resolveAttributes( body, docOrMsg, ve.dm.Converter.static.computedAttributes );
ve.targetLinksToNewWindow( body );
// Add styles so links render with their appropriate classes
ve.init.platform.linkCache.styleParsoidElements( $( body ), baseDoc );
// Remove metadata
contents = ve.filterMetaElements( Array.prototype.slice.call( body.childNodes ) );
this.$previewViewer.empty().append(
$( '<div>' ).addClass( 'mw-content-' + mw.config.get( 'wgVisualEditor' ).pageLanguageDir ).append(
contents
)
);
// Run hooks so other things can alter the document
mw.hook( 'wikipage.content' ).fire( this.$previewViewer );
} else {
this.$previewViewer.empty().append(
$( '<em>' ).text( docOrMsg )
);
}
this.popPending();
this.swapPanel( 'preview' );
};
@ -565,7 +590,7 @@ ve.ui.MWSaveDialog.prototype.initialize = function () {
scrollable: true,
padded: true
} );
this.$previewViewer = $( '<div>' ).addClass( 'mw-body-content mw-content-' + mw.config.get( 'wgVisualEditor' ).pageLanguageDir );
this.$previewViewer = $( '<div>' ).addClass( 'mw-body-content' );
this.previewPanel.$element
// Make focusable for keyboard accessible scrolling
.prop( 'tabIndex', 0 )