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

Merge "Take pageCanLoadVE into account when figuring out whether VE will load in-page or not"

Browse source
This commit is contained in:
jenkins-bot 2015-12-14 17:14:41 +00:00 committed by Gerrit Code Review
parent 04d8089db6 774034b553
commit d750417545
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -773,11 +773,13 @@
mw.user.options.get( 'visualeditor-tabs' ) !== 'multi-tab' && mw.user.options.get( 'visualeditor-tabs' ) !== 'multi-tab' &&
userPrefEnabled userPrefEnabled
) { ) {
loadVEInPage = mw.user.options.get( 'visualeditor-tabs' ) === 'prefer-ve' || loadVEInPage = pageCanLoadVE && (
mw.user.options.get( 'visualeditor-tabs' ) === 'prefer-ve' ||
( (
getLastEditor() !== 'wikitext' && getLastEditor() !== 'wikitext' &&
mw.user.options.get( 'visualeditor-tabs' ) !== 'prefer-wt' mw.user.options.get( 'visualeditor-tabs' ) !== 'prefer-wt'
); )
);
// Handle section edit link clicks // Handle section edit link clicks
$( '.mw-editsection a' ).on( 'click', function ( e ) { $( '.mw-editsection a' ).on( 'click', function ( e ) {
if ( loadVEInPage ) { if ( loadVEInPage ) {