jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360886 )
Change subject: Clear all diff state when switching editors
......................................................................
Clear all diff state when switching editors
Bug: T168618
Change-Id: I19ff5054b87568546bfe1202d67c5d863e1549be
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 13 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 4585298..7a56a9c 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1181,7 +1181,7 @@
this.clearPreparedCacheKey();
this.loading = false;
this.saving = false;
- this.wikitextDiffPromise = null;
+ this.clearDiff();
this.serializing = false;
this.submitting = false;
this.baseTimeStamp = null;
@@ -1634,14 +1634,23 @@
var target = this;
// Invalidate the viewer diff on next change
this.getSurface().getModel().getDocument().once( 'transact', function
() {
- target.saveDialog.clearDiff();
- target.wikitextDiffPromise = null;
+ target.clearDiff();
} );
this.saveDialog.setDiffAndReview(
this.getWikitextDiffPromise( doc ),
this.getVisualDiffGeneratorPromise(),
this.getSurface().getModel().getDocument().getHtmlDocument()
);
+};
+
+/**
+ * Clear all state associated with the diff
+ */
+ve.init.mw.ArticleTarget.prototype.clearDiff = function () {
+ if ( this.saveDialog ) {
+ this.saveDialog.clearDiff();
+ }
+ this.wikitextDiffPromise = null;
};
/**
@@ -2295,6 +2304,7 @@
*/
ve.init.mw.ArticleTarget.prototype.reloadSurface = function ( newMode,
dataPromise ) {
this.setDefaultMode( newMode );
+ this.clearDiff();
// Create progress - will be discarded when surface is destroyed.
this.getSurface().createProgress(
$.Deferred().promise(),
--
To view, visit https://gerrit.wikimedia.org/r/360886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19ff5054b87568546bfe1202d67c5d863e1549be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: 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
