Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172435
Change subject: Followup 5c0c117: make the edit tab work with oldid= again
......................................................................
Followup 5c0c117: make the edit tab work with oldid= again
After 5c0c117, clicking the VE edit tab on /wiki/Foo?oldid=123
sent you to /wiki/Foo?veaction=edit , dropping the oldid parameter
and editing the current version rather than the old version.
Fix this by only recomputing veEditUri from scratch when necessary,
and reusing the current URI when possible.
Change-Id: Iee9a745990f1a2bad40f46b8cdaaa727bb7fead8
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/35/172435/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 9bdc9c1..315e1d3 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -59,11 +59,13 @@
// exposed to mw.config (see BUG 53774), so we assume it exists.
pageExists = !!mw.config.get( 'wgArticleId' ) || mw.config.get(
'wgNamespaceNumber' ) < 0;
viewUri = new mw.Uri( mw.util.getUrl( mw.config.get(
'wgRelevantPageName' ) ) );
- veEditUri = viewUri.clone().extend( { veaction: 'edit' } );
isViewPage = (
mw.config.get( 'wgIsArticle' ) &&
!( 'diff' in uri.query )
);
+ // On a view page, extend the current URI so parameters like oldid are
carried over
+ // On a non-view pag, use viewUri
+ veEditUri = ( isViewPage ? uri : viewUri ).clone().extend( { veaction:
'edit' } );
support = {
es5: !!(
--
To view, visit https://gerrit.wikimedia.org/r/172435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee9a745990f1a2bad40f46b8cdaaa727bb7fead8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
