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

(attempt to) make NWE work with SET

Browse source 
Ugh.

Bug: T143578
Change-Id: I71e08508eb0914be9d624202b13a4369df512b80
This commit is contained in:
Alex Monk 2016-09-17 03:35:32 +01:00
parent 98a42ad1a9
commit edf5b60368
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -764,7 +764,8 @@
var showWikitextWelcome = true,
isLoggedIn = !mw.user.isAnon(),
prefSaysShowWelcome = isLoggedIn && !mw.user.options.get( 'visualeditor-hidebetawelcome' ),
urlSaysHideWelcome = 'hidewelcomedialog' in new mw.Uri( location.href ).query;
urlSaysHideWelcome = 'hidewelcomedialog' in new mw.Uri( location.href ).query,
action = 'edit';
if ( uri.query.action === 'edit' && $( '#wpTextbox1' ).length ) {
initialWikitext = $( '#wpTextbox1' ).textSelection( 'getContents' );
@ -784,7 +785,7 @@
// TODO: other params too? See identical list in VisualEditor.hooks.php)
) {
if (
// … if on a ?veaction=edit page
// … if on a ?veaction=edit/editsource page
( isViewPage && uri.query.veaction in editModes ) ||
// … or if on ?action=edit in single edit mode and the user wants it
(
@ -801,9 +802,20 @@
tabPreference === 'prefer-ve' &&
mw.config.get( 'wgAction' ) !== 'submit'
) ||
(
tabPreference === 'prefer-wte' &&
conf.enableWikitext &&
mw.user.options.get( 'visualeditor-newwikitext' )
) ||
(
tabPreference === 'remember-last' &&
getLastEditor() !== 'wikitext'
(
getLastEditor() !== 'wikitext' ||
(
conf.enableWikitext &&
mw.user.options.get( 'visualeditor-newwikitext' )
)
)
)
)
)
@ -815,7 +827,24 @@
type: uri.query.vesection === undefined ? 'page' : 'section',
mechanism: 'url'
} );
activateTarget( editModes[ uri.query.veaction ] );
if ( isViewPage && uri.query.veaction in editModes ) {
activateTarget( editModes[ uri.query.veaction ] );
} else {
if (
conf.enableWikitext &&
mw.user.options.get( 'visualeditor-newwikitext' ) &&
(
tabPreference === 'prefer-ve' ||
(
tabPreference === 'remember-last' &&
getLastEditor() === 'wikitext'
)
)
) {
action = 'editsource';
}
activateTarget( editModes[ action ] );
}
} else if ( pageCanLoadVE && userPrefEnabled ) {
// Page can be edited in VE, parameters are good, user prefs are mostly good
// but have visualeditor-tabs=prefer-wt? Add a keyboard shortcut to go to