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 "Simplify some SET logic"

Browse source
This commit is contained in:
jenkins-bot 2015-12-14 21:17:15 +00:00 committed by Gerrit Code Review
parent 0200bbf328 b7227f96fe
commit d3d851f394
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -241,6 +241,7 @@
function getLastEditor() {
var editor = $.cookie( 'VEE' );
// TODO: Check validity?
if ( !mw.user.isAnon() || !editor ) {
editor = mw.user.options.get( 'visualeditor-editor' );
}
@ -692,7 +693,7 @@
}
$( function () {
var key, loadVEInPage;
var key;
if ( uri.query.action === 'edit' && $( '#wpTextbox1' ).length ) {
initialWikitext = $( '#wpTextbox1' ).val();
}
@ -768,31 +769,28 @@
} );
} );
}
if (
conf.singleEditTab &&
mw.user.options.get( 'visualeditor-tabs' ) !== 'multi-tab' &&
userPrefEnabled
) {
loadVEInPage = pageCanLoadVE && (
userPrefEnabled &&
pageCanLoadVE && (
mw.user.options.get( 'visualeditor-tabs' ) === 'prefer-ve' ||
(
getLastEditor() !== 'wikitext' &&
mw.user.options.get( 'visualeditor-tabs' ) !== 'prefer-wt'
)
);
)
) {
// Handle section edit link clicks
$( '.mw-editsection a' ).on( 'click', function ( e ) {
if ( loadVEInPage ) {
init.onEditSectionLinkClick( e );
}
init.onEditSectionLinkClick( e );
} );
// Allow instant switching to edit mode, without refresh
$( '#ca-edit' ).on( 'click', function ( e ) {
if ( loadVEInPage ) {
trackActivateStart( { type: 'page', mechanism: 'click' } );
activateTarget();
e.preventDefault();
}
trackActivateStart( { type: 'page', mechanism: 'click' } );
activateTarget();
e.preventDefault();
} );
} else if ( userPrefEnabled ) {
init.setupSkin();