jenkins-bot has submitted this change and it was merged.
Change subject: mw.ViewPageTarget: Ensure canonial view url is restored
......................................................................
mw.ViewPageTarget: Ensure canonial view url is restored
When loading VE by clicking Edit on a view url, this naturally
works (we temporarily append our query, and remove it when ready).
When loading VE from a permalink (e.g. Open in new tab) or any
other source linked from HTML pages, then we're not in control
over adding the query (it's already there); we're only in control
over restoring the view url afterwards.
Bug: T102363
Change-Id: I4912ff1c6b28ac987517760ffed481a4cd3bd1ca
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 13 insertions(+), 11 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 3caffa2..deeb0d2 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -85,9 +85,10 @@
} );
if ( history.replaceState ) {
- // This is to stop the back button breaking when it's supposed
to take us back out
- // of VE. It used to only be called when venotify is used.
FIXME: there should be
- // a much better solution than this.
+ // We replace the current state with one that's marked with our
tag. This way, when users
+ // use the Back button to exit the editor we can restore Read
mode. This is because we want
+ // to ignore foreign states in onWindowPopState. Without this,
the Read state is foreign.
+ // FIXME: There should be a much better solution than this.
history.replaceState( this.popState, document.title, currentUri
);
}
@@ -1414,7 +1415,7 @@
* Page modifications for switching back to view mode.
*/
ve.init.mw.ViewPageTarget.prototype.restorePage = function () {
- var uri;
+ var uri, keys;
// Skins like monobook don't have a tab for view mode and instead just
have the namespace tab
// selected. We didn't deselect the namespace tab, so we're ready after
deselecting #ca-ve-edit.
@@ -1425,9 +1426,9 @@
mw.hook( 've.deactivate' ).fire();
this.emit( 'deactivate' );
- // Push non-veaction=edit url in history
+ // Push article url into history
if ( !this.actFromPopState && history.pushState ) {
- // Remove the veaction query parameter
+ // Remove the VisualEditor query parameters
uri = this.currentUri;
if ( 'veaction' in uri.query ) {
delete uri.query.veaction;
@@ -1436,12 +1437,13 @@
delete uri.query.vesection;
}
- // If there are other query parameters, set the url to the
current url (with veaction removed).
- // Otherwise use the canonical style view url (bug 42553).
- if ( ve.getObjectValues( uri.query ).length ) {
- history.pushState( this.popState, document.title, uri );
- } else {
+ // If there are any other query parameters left, re-use that
uri object.
+ // Otherwise use the canonical style view url (T44553, T102363).
+ keys = Object.keys( uri.query );
+ if ( !keys.length || ( keys.length === 1 && keys[0] === 'title'
) ) {
history.pushState( this.popState, document.title,
this.viewUri );
+ } else {
+ history.pushState( this.popState, document.title, uri );
}
}
this.actFromPopState = false;
--
To view, visit https://gerrit.wikimedia.org/r/218337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4912ff1c6b28ac987517760ffed481a4cd3bd1ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
