wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 16:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ve.init.mw.DesktopArticleTarget: Fix generated URL when loaded using veaction=edit in single-tab mode"

Browse source
This commit is contained in:
jenkins-bot 2019-07-31 13:28:59 +00:00 committed by Gerrit Code Review
parent 2d2e7dcdb2 7d3154fea8
commit 51b93cea94
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -1226,7 +1226,8 @@ ve.init.mw.DesktopArticleTarget.prototype.transformCategoryLinks = function ( $c
*/ */
ve.init.mw.DesktopArticleTarget.prototype.updateHistoryState = function () { ve.init.mw.DesktopArticleTarget.prototype.updateHistoryState = function () {
var uri, var uri,
veaction = this.getDefaultMode() === 'visual' ? 'edit' : 'editsource'; veaction = this.getDefaultMode() === 'visual' ? 'edit' : 'editsource',
section = this.section !== null ? this.section : undefined;
// Push veaction=edit(source) url in history (if not already. If we got here by a veaction=edit(source) // Push veaction=edit(source) url in history (if not already. If we got here by a veaction=edit(source)
// permalink then it will be there already and the constructor called #activate) // permalink then it will be there already and the constructor called #activate)
@ -1235,7 +1236,7 @@ ve.init.mw.DesktopArticleTarget.prototype.updateHistoryState = function () {
history.pushState && history.pushState &&
( (
this.currentUri.query.veaction !== veaction || this.currentUri.query.veaction !== veaction ||
this.currentUri.query.section !== this.section this.currentUri.query.section !== section
) && ) &&
this.currentUri.query.action !== 'edit' this.currentUri.query.action !== 'edit'
) { ) {