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 "Warn for empty summary when edit section used"

Browse source
This commit is contained in:
jenkins-bot 2016-02-25 18:56:57 +00:00 committed by Gerrit Code Review
parent 48a2404923 5da37932a2
commit 7bef4c9a20
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -927,7 +927,6 @@ ve.init.mw.DesktopArticleTarget.prototype.openSaveDialog = function () {
checkboxFields: this.checkboxFields, checkboxFields: this.checkboxFields,
checkboxesByName: this.checkboxesByName checkboxesByName: this.checkboxesByName
} ); } );
this.initialEditSummary = undefined;
}; };
/** /**

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

@ -1195,7 +1195,7 @@ ve.init.mw.ArticleTarget.prototype.startSave = function ( saveDeferred ) {
if ( if (
+mw.user.options.get( 'forceeditsummary' ) && +mw.user.options.get( 'forceeditsummary' ) &&
saveOptions.summary === '' && ( saveOptions.summary === '' || saveOptions.summary === this.initialEditSummary ) &&
!this.saveDialog.messages.missingsummary !this.saveDialog.messages.missingsummary
) { ) {
this.saveDialog.showMessage( this.saveDialog.showMessage(

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

@ -28,6 +28,7 @@ ve.ui.MWSaveDialog = function VeUiMwSaveDialog( config ) {
this.setupDeferred = $.Deferred(); this.setupDeferred = $.Deferred();
this.target = null; this.target = null;
this.checkboxesByName = null; this.checkboxesByName = null;
this.changedEditSummary = false;
// Initialization // Initialization
this.$element.addClass( 've-ui-mwSaveDialog' ); this.$element.addClass( 've-ui-mwSaveDialog' );
@ -382,6 +383,7 @@ ve.ui.MWSaveDialog.prototype.initialize = function () {
// Limit byte length, and display the remaining bytes // Limit byte length, and display the remaining bytes
this.editSummaryInput.$input.byteLimit( this.editSummaryByteLimit ); this.editSummaryInput.$input.byteLimit( this.editSummaryByteLimit );
this.editSummaryInput.on( 'change', function () { this.editSummaryInput.on( 'change', function () {
dialog.changedEditSummary = true;
// TODO: This looks a bit weird, there is no unit in the UI, just numbers // TODO: This looks a bit weird, there is no unit in the UI, just numbers
// Users likely assume characters but then it seems to count down quicker // Users likely assume characters but then it seems to count down quicker
// than expected. Facing users with the word "byte" is bad? (bug 40035) // than expected. Facing users with the word "byte" is bad? (bug 40035)
@ -480,7 +482,7 @@ ve.ui.MWSaveDialog.prototype.getSetupProcess = function ( data ) {
return ve.ui.MWSaveDialog.super.prototype.getSetupProcess.call( this, data ) return ve.ui.MWSaveDialog.super.prototype.getSetupProcess.call( this, data )
.next( function () { .next( function () {
this.target = data.target; this.target = data.target;
if ( data.editSummary !== undefined ) { if ( !this.changedEditSummary ) {
this.setEditSummary( data.editSummary ); this.setEditSummary( data.editSummary );
} }
this.setupCheckboxes( data.checkboxFields || [] ); this.setupCheckboxes( data.checkboxFields || [] );