[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ArticleTarget: Improve edit summary behavior when switching

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342083 )

Change subject: ArticleTarget: Improve edit summary behavior when switching
......................................................................


ArticleTarget: Improve edit summary behavior when switching

Distinguish between the initial summary state, and a value stored from the
summary when switching modes. This lets us avoid overwriting a stored value
when section-editing, or assuming a stored value after a switch was never
edited.

Bug: T159686
Change-Id: Ie7640538140a14bbafd539b3a45928f5c55cf804
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 9d88819..d110ba1 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1170,7 +1170,7 @@
  */
 ve.init.mw.DesktopArticleTarget.prototype.getSaveDialogOpeningData = function 
() {
        var data = 
ve.init.mw.DesktopArticleTarget.super.prototype.getSaveDialogOpeningData.apply( 
this, arguments );
-       data.editSummary = this.initialEditSummary;
+       data.editSummary = this.editSummaryValue || this.initialEditSummary;
        return data;
 };
 
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index df94497..d265457 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1578,7 +1578,7 @@
 ve.init.mw.ArticleTarget.prototype.getSaveFields = function () {
        var name,
                fields = {
-                       wpSummary: this.saveDialog ? 
this.saveDialog.editSummaryInput.getValue() : this.initialEditSummary,
+                       wpSummary: this.saveDialog ? 
this.saveDialog.editSummaryInput.getValue() : ( this.editSummaryValue || 
this.initialEditSummary ),
                        wpCaptchaId: this.captcha && this.captcha.id,
                        wpCaptchaWord: this.captcha && 
this.captcha.input.getValue()
                };
@@ -1822,7 +1822,7 @@
        this.attachToolbarSaveButton();
 
        if ( this.saveDialog ) {
-               this.initialEditSummary = this.initialEditSummary || 
this.saveDialog.editSummaryInput.getValue();
+               this.editSummaryValue = 
this.saveDialog.editSummaryInput.getValue();
                this.saveDialog.disconnect( this );
                this.saveDialog = null;
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/342083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7640538140a14bbafd539b3a45928f5c55cf804
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch <dly...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits