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

Correctly use mwcite action and hide basic/existing ref inside basic reference

Browse source 
Disable the option for basic reference and for existing reference from inside
the basic reference dialog itself.

Also make sure the dialog opens its intended target citation dialogs with the
new mwcite action rather than directly so the reference to the inDialog surface
is preserved.

Change-Id: Idc6e5b849e2dbd422807a6d3cacde8f274e42854
This commit is contained in:
Moriel Schottlender 2015-04-15 15:21:15 -07:00
parent 07001001be
commit 203d1e8600
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/ve-mw/ui/dialogs/ve.ui.MWGeneralReferenceDialog.js
View file

@ -53,7 +53,7 @@ ve.ui.MWGeneralReferenceDialog.prototype.getBodyHeight = function () {
* @inheritdoc
*/
ve.ui.MWGeneralReferenceDialog.prototype.initialize = function () {
var sourceField, refBasic,
var sourceField,
tools, i, len, item,
items = [],
limit = ve.init.mw.Target.static.citationToolsLimit;
@ -88,7 +88,8 @@ ve.ui.MWGeneralReferenceDialog.prototype.initialize = function () {
}
}
// Basic tools
refBasic = new OO.ui.DecoratedOptionWidget( {
this.refBasic = new OO.ui.DecoratedOptionWidget( {
icon: 'reference',
label: ve.msg( 'visualeditor-dialogbutton-reference-full-label' ),
data: { windowName: 'reference' }
@ -114,7 +115,7 @@ ve.ui.MWGeneralReferenceDialog.prototype.initialize = function () {
this.basicSelect = new OO.ui.SelectWidget( {
classes: [ 've-ui-mwGeneralReferenceDialog-select' ],
items: [ refBasic, this.refExisting ]
items: [ this.refBasic, this.refExisting ]
} );
// Events
@ -138,8 +139,14 @@ ve.ui.MWGeneralReferenceDialog.prototype.initialize = function () {
ve.ui.MWGeneralReferenceDialog.prototype.getSetupProcess = function ( data ) {
return ve.ui.MWGeneralReferenceDialog.super.prototype.getSetupProcess.call( this, data )
.next( function () {
// Check if the 'use existing' button should be enabled
this.refExisting.setDisabled( !this.doReferencesExist() );
if ( this.manager.surface.getInDialog() === 'reference' ) {
// Hide basic reference if we are already in the basic reference menu
this.refBasic.setDisabled( true );
this.refExisting.setDisabled( true );
} else {
// Check if the 'use existing' button should be enabled
this.refExisting.setDisabled( !this.doReferencesExist() );
}
}, this );
};
@ -185,7 +192,7 @@ ve.ui.MWGeneralReferenceDialog.prototype.onSelectChoose = function ( item ) {
// Close this dialog then open the new dialog
this.close().then( function () {
manager.getSurface().execute( 'window', 'open', data.windowName, $.extend( {
manager.getSurface().execute( 'mwcite', 'open', data.windowName, $.extend( {
fragment: fragment
}, data.dialogData ) );
} );