Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/259955
Change subject: Preserve oldid when switching from VE into WTE
......................................................................
Preserve oldid when switching from VE into WTE
Bug: T120898
Change-Id: I51774fd7ca5be7373d8aec55cb420a874bc7d531
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/55/259955/1
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 ab5b8f3..99069dd 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1371,7 +1371,9 @@
* @param {boolean} [modified] Whether there were any changes at all.
*/
ve.init.mw.DesktopArticleTarget.prototype.switchToWikitextEditor = function (
discardChanges, modified ) {
- var target = this,
+ var uri,
+ oldid = this.currentUri.query.oldid || $(
'input[name=parentRevId]' ).val(),
+ target = this,
prefPromise = mw.libs.ve.setEditorPreference( 'wikitext' );
if ( discardChanges ) {
@@ -1382,10 +1384,14 @@
}
this.submitting = true;
prefPromise.done( function () {
- location.href = target.viewUri.clone().extend( {
+ uri = target.viewUri.clone().extend( {
action: 'edit',
veswitched: 1
- } ).toString();
+ } );
+ if ( oldid ) {
+ uri.extend( { oldid: oldid } );
+ }
+ location.href = uri.toString();
} );
} else {
this.serialize(
--
To view, visit https://gerrit.wikimedia.org/r/259955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51774fd7ca5be7373d8aec55cb420a874bc7d531
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
