Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/259960
Change subject: Preserve oldid when switching from WTE into VE
......................................................................
Preserve oldid when switching from WTE into VE
Change-Id: I8682a2a2b90ae2e42f1a8e01e16d0f9f3d66a2d5
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/60/259960/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 55cd5ff..1b89856 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -20,7 +20,7 @@
( function () {
var conf, tabMessages, uri, pageExists, viewUri, veEditUri, isViewPage,
isEditPage,
pageCanLoadVE, init, support, targetPromise, enable,
tempdisable, autodisable,
- userPrefEnabled, initialWikitext,
+ userPrefEnabled, initialWikitext, oldid,
active = false,
progressStep = 0,
progressSteps = [
@@ -197,7 +197,7 @@
.then( function () {
return mw.libs.ve.targetLoader.requestPageData(
mw.config.get( 'wgRelevantPageName' ),
- uri.query.oldid || $(
'input[name=parentRevId]' ).val(),
+ oldid,
'mwTarget', //
ve.init.mw.DesktopArticleTarget.static.name
modified
);
@@ -265,6 +265,7 @@
conf = mw.config.get( 'wgVisualEditorConfig' );
tabMessages = conf.tabMessages;
uri = new mw.Uri();
+ oldid = uri.query.oldid || $( 'input[name=parentRevId]' ).val();
pageExists = !!mw.config.get( 'wgRelevantArticleId' );
viewUri = new mw.Uri( mw.util.getUrl( mw.config.get(
'wgRelevantPageName' ) ) );
isViewPage = mw.config.get( 'wgIsArticle' ) && !( 'diff' in uri.query );
@@ -286,6 +287,9 @@
veEditUri = ( pageCanLoadVE ? uri : viewUri ).clone().extend( {
veaction: 'edit' } );
delete veEditUri.query.action;
}
+ if ( oldid ) {
+ veEditUri.extend( { oldid: oldid } );
+ }
support = {
es5: !!(
--
To view, visit https://gerrit.wikimedia.org/r/259960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8682a2a2b90ae2e42f1a8e01e16d0f9f3d66a2d5
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
