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

Merge "Re-fix in-page loading"

Browse source
This commit is contained in:
jenkins-bot 2015-11-23 17:00:13 +00:00 committed by Gerrit Code Review
parent 4616696e0d a0462d69d4
commit 5649256ceb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,8 +18,8 @@
* @singleton
*/
( function () {
var conf, tabMessages, uri, pageExists, viewUri, veEditUri, pageCanLoadVE, init,
support, targetPromise, enable, tempdisable, autodisable, userPrefEnabled,
var conf, tabMessages, uri, pageExists, viewUri, veEditUri, isViewPage, pageCanLoadVE,
init, support, targetPromise, enable, tempdisable, autodisable, userPrefEnabled,
initialWikitext,
active = false,
progressStep = 0,
@ -223,8 +223,9 @@
uri = new mw.Uri();
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 );
pageCanLoadVE = (
( mw.config.get( 'wgIsArticle' ) && !( 'diff' in uri.query ) ) ||
isViewPage ||
mw.config.get( 'wgAction' ) === 'edit' ||
mw.config.get( 'wgAction' ) === 'submit'
);
@ -565,7 +566,7 @@
} );
} );
} );
} else if ( wikitext ) {
} else if ( isViewPage || wikitext ) {
activatePageTarget();
} else {
location.href = veEditUri;