mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-12-01 01:16:30 +00:00
Merge "Show images/descriptions on import's title widget if possible"
This commit is contained in:
commit
d318f79a61
|
@ -15,11 +15,15 @@
|
||||||
.concat( conf.pluginModules.filter( mw.loader.getState ) ),
|
.concat( conf.pluginModules.filter( mw.loader.getState ) ),
|
||||||
loadingPromise = mw.loader.using( modules ),
|
loadingPromise = mw.loader.using( modules ),
|
||||||
progressBar = OO.ui.infuse( $( '.ve-init-mw-collabTarget-loading' ) ),
|
progressBar = OO.ui.infuse( $( '.ve-init-mw-collabTarget-loading' ) ),
|
||||||
form = OO.ui.infuse( $( '.ve-init-mw-collabTarget-form' ) ),
|
|
||||||
documentNameInput = OO.ui.infuse( $( '.ve-init-mw-collabTarget-nameInput' ) ),
|
documentNameInput = OO.ui.infuse( $( '.ve-init-mw-collabTarget-nameInput' ) ),
|
||||||
documentNameButton = OO.ui.infuse( $( '.ve-init-mw-collabTarget-nameButton' ) ),
|
documentNameButton = OO.ui.infuse( $( '.ve-init-mw-collabTarget-nameButton' ) ),
|
||||||
importInput = OO.ui.infuse( $( '.ve-init-mw-collabTarget-importInput' ) ),
|
importInput = OO.ui.infuse( $( '.ve-init-mw-collabTarget-importInput' ), {
|
||||||
importButton = OO.ui.infuse( $( '.ve-init-mw-collabTarget-importButton' ) );
|
showImages: mw.config.get( 'wgVisualEditor' ).usePageImages,
|
||||||
|
showDescriptions: mw.config.get( 'wgVisualEditor' ).usePageDescriptions
|
||||||
|
} ),
|
||||||
|
importButton = OO.ui.infuse( $( '.ve-init-mw-collabTarget-importButton' ) ),
|
||||||
|
// Infuse the form last to avoid recursive infusion with no config
|
||||||
|
form = OO.ui.infuse( $( '.ve-init-mw-collabTarget-form' ) );
|
||||||
|
|
||||||
if ( !VisualEditorSupportCheck() ) {
|
if ( !VisualEditorSupportCheck() ) {
|
||||||
// VE not supported - say something?
|
// VE not supported - say something?
|
||||||
|
|
Loading…
Reference in a new issue