jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362230 )
Change subject: Disable 'auto' tab if type map isn't setup
......................................................................
Disable 'auto' tab if type map isn't setup
Also, only show separator if more than one type
in manual.
Bug: T169219
Change-Id: I6653700e833f4804537826693d6fad82e60e1208
---
M modules/ve.ui.CiteFromIdInspector.js
M modules/ve.ui.CiteSourceSelectWidget.js
2 files changed, 14 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
Mvolz: Looks good to me, approved
diff --git a/modules/ve.ui.CiteFromIdInspector.js
b/modules/ve.ui.CiteFromIdInspector.js
index ec17cdc..b4d88b9 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -170,6 +170,9 @@
this.modePanels.reuse
] );
+ this.modeIndex.getTabPanel( 'auto' ).tabItem.setDisabled(
!this.templateTypeMap );
+ this.defaultPanel = this.templateTypeMap ? 'auto' : 'manual';
+
// Auto mode
this.autoProcessStack = new OO.ui.StackLayout( {
expanded: false,
@@ -280,10 +283,10 @@
var inspector = this;
if ( [ 'auto', 'manual', 'reuse' ].indexOf( tabPanelName ) === -1 ) {
- tabPanelName = 'auto';
- } else if ( tabPanelName === 'reuse' && this.modeIndex.getTabPanel(
'reuse' ).tabItem.isDisabled() ) {
- tabPanelName = 'auto';
- } else if ( tabPanelName !== ( ve.userConfig( 'citoid-mode' ) || 'auto'
) ) {
+ tabPanelName = this.defaultPanel;
+ } else if ( this.modeIndex.getTabPanel( tabPanelName
).tabItem.isDisabled() ) {
+ tabPanelName = this.defaultPanel;
+ } else if ( tabPanelName !== ( ve.userConfig( 'citoid-mode' ) ||
this.defaultPanel ) ) {
ve.userConfig( 'citoid-mode', tabPanelName );
}
@@ -480,7 +483,7 @@
this.executeAction( 'lookup' );
}
- this.modeIndex.setTabPanel( data.lookup ? 'auto' : (
ve.userConfig( 'citoid-mode' ) || 'auto' ) );
+ this.modeIndex.setTabPanel( data.lookup ?
this.defaultPanel : ( ve.userConfig( 'citoid-mode' ) || this.defaultPanel ) );
}, this );
};
@@ -491,7 +494,7 @@
return ve.ui.CiteFromIdInspector.super.prototype.getReadyProcess.call(
this, data )
.next( function () {
// Set the panel after ready as it focuses the input too
- var mode = data.lookup ? 'auto' : ( ve.userConfig(
'citoid-mode' ) || 'auto' );
+ var mode = data.lookup ? this.defaultPanel : (
ve.userConfig( 'citoid-mode' ) || this.defaultPanel );
this.setModePanel( mode, mode === 'auto' ? 'lookup' :
undefined );
}, this );
};
diff --git a/modules/ve.ui.CiteSourceSelectWidget.js
b/modules/ve.ui.CiteSourceSelectWidget.js
index bee6d4c..1647066 100644
--- a/modules/ve.ui.CiteSourceSelectWidget.js
+++ b/modules/ve.ui.CiteSourceSelectWidget.js
@@ -64,9 +64,11 @@
this.addItems( items );
- $( '<div>' )
- .addClass( 've-ui-citeSourceSelectWidget-separator' )
- .insertBefore( this.refBasic.$element );
+ if ( items.length > 1 ) {
+ $( '<div>' )
+ .addClass( 've-ui-citeSourceSelectWidget-separator' )
+ .insertBefore( this.refBasic.$element );
+ }
// Initialization
this.$element.addClass( 've-ui-citeSourceSelectWidget' );
--
To view, visit https://gerrit.wikimedia.org/r/362230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6653700e833f4804537826693d6fad82e60e1208
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Mvolz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
