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

Merge "Show preview of edit summary in review screen"

Browse source
This commit is contained in:
jenkins-bot 2014-02-19 23:07:19 +00:00 committed by Gerrit Code Review
parent d774a642c9 675d91b7e8
commit 01570025d3
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VisualEditor.php
View file

@ -195,6 +195,8 @@ $wgResourceModules += array(
'editing',
'spamprotectionmatch',
'spamprotectiontext',
'summary-preview',
'parentheses',
// Messages needed by VE in init phase only (rest go below)
'visualeditor-loadwarning',

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

@ -101,7 +101,8 @@ ve.ui.MWSaveDialog.prototype.setSanityCheck = function ( verified ) {
* @throws {Error} Unknown saveDialog panel
*/
ve.ui.MWSaveDialog.prototype.swapPanel = function ( panel ) {
var dialog = this,
var currentEditSummaryWikitext,
dialog = this,
panelObj = dialog[panel + 'Panel'];
if ( ve.indexOf( panel, [ 'save', 'review', 'conflict', 'nochanges' ] ) === -1 ) {
@ -145,6 +146,23 @@ ve.ui.MWSaveDialog.prototype.swapPanel = function ( panel ) {
case 'review':
// Make room for the diff by transitioning to a non-small window
this.$frame.removeClass( 've-ui-window-frame-small' );
currentEditSummaryWikitext = this.editSummaryInput.getValue();
if ( this.lastEditSummaryWikitext === undefined || this.lastEditSummaryWikitext !== currentEditSummaryWikitext ) {
if ( this.editSummaryXhr ) {
this.editSummaryXhr.abort();
}
this.lastEditSummaryWikitext = currentEditSummaryWikitext;
this.$reviewEditSummary.empty()
.parent().addClass( 'mw-ajax-loader' );
this.editSummaryXhr = new mw.Api().post( {
action: 'parse',
summary: currentEditSummaryWikitext
} ).done( function ( result ) {
dialog.$reviewEditSummary.html( ve.msg( 'parentheses', result.parse.parsedsummary['*'] ) )
.parent().removeClass( 'mw-ajax-loader' );
} );
}
/* falls through */
case 'nochanges':
this.saveButton.$element.hide();
@ -328,8 +346,17 @@ ve.ui.MWSaveDialog.prototype.initialize = function () {
// Review panel
this.reviewPanel = new OO.ui.PanelLayout( { '$': this.$, 'scrollable': true } );
this.$reviewViewer = this.$( '<div>' ).addClass( 've-ui-mwSaveDialog-viewer' );
this.$reviewEditSummary = this.$( '<span>' ).addClass( 've-ui-mwSaveDialog-summaryPreview' ).addClass( 'comment' );
this.$reviewActions = this.$( '<div>' ).addClass( 've-ui-mwSaveDialog-actions' );
this.reviewPanel.$element.append( this.$reviewViewer, this.$reviewActions );
this.reviewPanel.$element.append(
$( '<br>' ),
$( '<div>' )
.addClass( 'mw-summary-preview' )
.text( ve.msg( 'summary-preview' ) )
.append( $( '<br>' ), this.$reviewEditSummary ),
this.$reviewViewer,
this.$reviewActions
);
// Conflict panel
this.conflictPanel = new OO.ui.PanelLayout( { '$': this.$, 'scrollable': true } );