jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403644 )
Change subject: Allow note-language to be unset in VE, and use as default
......................................................................
Allow note-language to be unset in VE, and use as default
Change-Id: I0f3f7cde4a720adb2a2a3cae93d4af751603ca52
---
M modules/ve-score/ve.ui.MWScoreInspector.js
1 file changed, 13 insertions(+), 4 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-score/ve.ui.MWScoreInspector.js
b/modules/ve-score/ve.ui.MWScoreInspector.js
index 3de0296..dfa2383 100644
--- a/modules/ve-score/ve.ui.MWScoreInspector.js
+++ b/modules/ve-score/ve.ui.MWScoreInspector.js
@@ -44,7 +44,9 @@
vorbisField, overrideOggField,
rawField,
notationTabPanel, audioTabPanel, advancedTabPanel,
- language, languages = mw.config.get( 'wgScoreNoteLanguages' );
+ language,
+ languageItems = [],
+ languages = mw.config.get( 'wgScoreNoteLanguages' );
// Parent method
ve.ui.MWScoreInspector.super.prototype.initialize.call( this );
@@ -97,12 +99,19 @@
// Note Language
this.noteLanguageDropdown = new OO.ui.DropdownWidget();
+ languageItems.push(
+ new OO.ui.MenuOptionWidget( {
+ data: null,
+ label: '\u00a0'
+ } )
+ );
for ( language in languages ) {
- this.noteLanguageDropdown.getMenu().insertItem( new
OO.ui.MenuOptionWidget( {
+ languageItems.push( new OO.ui.MenuOptionWidget( {
data: language,
label: languages[ language ]
} ) );
}
+ this.noteLanguageDropdown.getMenu().addItems( languageItems );
// Checkboxes
this.midiCheckbox = new OO.ui.CheckboxInputWidget();
@@ -177,7 +186,7 @@
.next( function () {
var attributes = this.selectedNode.getAttribute( 'mw'
).attrs,
lang = attributes.lang || 'lilypond',
- noteLanguage = attributes[ 'note-language' ] ||
mw.config.get( 'wgScoreDefaultNoteLanguage' ),
+ noteLanguage = attributes[ 'note-language' ] ||
null,
raw = attributes.raw !== undefined,
vorbis = attributes.vorbis === '1',
/* eslint-disable camelcase */
@@ -246,7 +255,7 @@
// Get data from inspector
lang = this.langSelect.findSelectedItem().getData();
- noteLanguage =
this.noteLanguageDropdown.getMenu().findSelectedItem().getData();
+ noteLanguage =
this.noteLanguageDropdown.getMenu().findSelectedItem().getData() || undefined;
raw = !this.rawCheckbox.isDisabled() && this.rawCheckbox.isSelected();
// audioCheckbox is selected if an audio file is being included,
whether that file
// is being auto-generated or whether an existing file is being used;
but the "vorbis"
--
To view, visit https://gerrit.wikimedia.org/r/403644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f3f7cde4a720adb2a2a3cae93d4af751603ca52
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: DLynch <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
