Albert221 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402131 )
Change subject: Remove midi checkbox from VisualEditor
......................................................................
Remove midi checkbox from VisualEditor
It is no longer needed since midi attribute
doesn't exist now.
Bug: T183736
Change-Id: I01b71004b52677eb9fb152017875e90855c7bb6e
---
M modules/ve-score/ve.ui.MWScoreInspector.js
1 file changed, 9 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score
refs/changes/31/402131/1
diff --git a/modules/ve-score/ve.ui.MWScoreInspector.js
b/modules/ve-score/ve.ui.MWScoreInspector.js
index ab0fbf6..b1cbd99 100644
--- a/modules/ve-score/ve.ui.MWScoreInspector.js
+++ b/modules/ve-score/ve.ui.MWScoreInspector.js
@@ -39,12 +39,11 @@
* @inheritdoc
*/
ve.ui.MWScoreInspector.prototype.initialize = function () {
- var inputField, langField, noteLanguageField,
- midiField, overrideMidiField,
+ var inputField, langField,
+ noteLanguageField, overrideMidiField,
vorbisField, overrideOggField,
rawField,
- notationTabPanel, audioTabPanel, midiTabPanel, advancedTabPanel,
- language, languages = mw.config.get( 'wgScoreNoteLanguages' );
+ notationTabPanel, audioTabPanel, advancedTabPanel;
// Parent method
ve.ui.MWScoreInspector.super.prototype.initialize.call( this );
@@ -68,12 +67,6 @@
scrollable: false,
padded: true
} );
- midiTabPanel = new OO.ui.TabPanelLayout( 'midi', {
- label: ve.msg( 'score-visualeditor-mwscoreinspector-card-midi'
),
- expanded: false,
- scrollable: false,
- padded: true
- } );
advancedTabPanel = new OO.ui.TabPanelLayout( 'advanced', {
label: ve.msg(
'score-visualeditor-mwscoreinspector-card-advanced' ),
expanded: false,
@@ -84,7 +77,6 @@
this.indexLayout.addTabPanels( [
notationTabPanel,
audioTabPanel,
- midiTabPanel,
advancedTabPanel
] );
@@ -112,7 +104,6 @@
}
// Checkboxes
- this.midiCheckbox = new OO.ui.CheckboxInputWidget();
this.audioCheckbox = new OO.ui.CheckboxInputWidget();
this.rawCheckbox = new OO.ui.CheckboxInputWidget();
@@ -145,10 +136,6 @@
align: 'top',
label: ve.msg(
'score-visualeditor-mwscoreinspector-override-ogg' )
} );
- midiField = new OO.ui.FieldLayout( this.midiCheckbox, {
- align: 'inline',
- label: ve.msg( 'score-visualeditor-mwscoreinspector-midi' )
- } );
overrideMidiField = new OO.ui.FieldLayout( this.overrideMidiInput, {
align: 'top',
label: ve.msg(
'score-visualeditor-mwscoreinspector-override-midi' )
@@ -171,12 +158,9 @@
vorbisField.$element,
overrideOggField.$element
);
- midiTabPanel.$element.append(
- midiField.$element,
- overrideMidiField.$element
- );
advancedTabPanel.$element.append(
- rawField.$element
+ rawField.$element,
+ overrideMidiField.$element
);
this.form.$element.append(
this.indexLayout.$element
@@ -193,7 +177,6 @@
lang = attributes.lang || 'lilypond',
noteLanguage = attributes[ 'note-language' ] ||
mw.config.get( 'wgScoreDefaultNoteLanguage' ),
raw = attributes.raw !== undefined,
- midi = attributes.midi === '1',
vorbis = attributes.vorbis === '1',
/* eslint-disable camelcase */
overrideMidi = attributes.override_midi || '',
@@ -204,7 +187,6 @@
this.langSelect.selectItemByData( lang );
this.noteLanguageDropdown.getMenu().selectItemByData(
noteLanguage );
this.rawCheckbox.setSelected( raw );
- this.midiCheckbox.setSelected( midi );
// vorbis is only set to 1 if an audio file is being
auto-generated, but
// the checkbox should be checked if an audio file is
being auto-generated
// OR if an existing file has been specified.
@@ -222,7 +204,6 @@
this.langSelect.on( 'choose', this.onChangeHandler );
this.noteLanguageDropdown.on( 'labelChange',
this.onChangeHandler );
this.rawCheckbox.on( 'change', this.onChangeHandler );
- this.midiCheckbox.on( 'change', this.onChangeHandler );
this.audioCheckbox.on( 'change', this.onChangeHandler );
this.overrideMidiInput.on( 'change',
this.onChangeHandler );
this.overrideOggInput.on( 'change',
this.onChangeHandler );
@@ -231,7 +212,6 @@
this.indexLayout.connect( this, { set: 'onTabPanelSet'
} );
this.indexLayout.connect( this, { set: 'updateSize' } );
this.langSelect.connect( this, { choose:
'toggleDisableRawCheckbox' } );
- this.midiCheckbox.connect( this, { change:
'toggleDisableOverrideMidiInput' } );
this.audioCheckbox.connect( this, { change:
'toggleDisableOverrideOggInput' } );
}, this );
};
@@ -251,7 +231,6 @@
this.indexLayout.disconnect( this );
this.langSelect.disconnect( this );
- this.midiCheckbox.disconnect( this );
this.audioCheckbox.disconnect( this );
}, this );
};
@@ -260,7 +239,7 @@
* @inheritdoc
*/
ve.ui.MWScoreInspector.prototype.updateMwData = function ( mwData ) {
- var lang, noteLanguage, raw, midi, vorbis, overrideMidi, overrideOgg;
+ var lang, raw, noteLanguage, vorbis, overrideMidi, overrideOgg;
// Parent method
ve.ui.MWScoreInspector.super.prototype.updateMwData.call( this, mwData
);
@@ -275,16 +254,12 @@
// being auto-generated.
vorbis = this.audioCheckbox.isSelected() &&
this.overrideOggInput.getValue() === '';
overrideOgg = !this.overrideOggInput.isDisabled() &&
this.overrideOggInput.getValue();
- // The "midi" attribute is set to 1 if a MIDI file is being linked to,
whether or not
- // this file is being auto-generated.
- midi = this.midiCheckbox.isSelected();
overrideMidi = !this.overrideMidiInput.isDisabled() &&
this.overrideMidiInput.getValue();
// Update attributes
mwData.attrs.lang = lang;
mwData.attrs[ 'note-language' ] = raw ? undefined : noteLanguage;
mwData.attrs.raw = raw ? '1' : undefined;
- mwData.attrs.midi = midi ? '1' : undefined;
mwData.attrs.vorbis = vorbis ? '1' : undefined;
/* eslint-disable camelcase */
mwData.attrs.override_midi = overrideMidi || undefined;
@@ -301,6 +276,7 @@
};
/**
+<<<<<<< HEAD
* Set the disabled status of this.noteLanguage based on the raw attribute
*/
ve.ui.MWScoreInspector.prototype.toggleDisableNoteLanguageDropdown = function
() {
@@ -317,6 +293,8 @@
};
/**
+=======
+>>>>>>> Remove midi checkbox from VisualEditor
* Set the disabled status of this.overrideOggInput based on the vorbis
attribute
*/
ve.ui.MWScoreInspector.prototype.toggleDisableOverrideOggInput = function () {
--
To view, visit https://gerrit.wikimedia.org/r/402131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01b71004b52677eb9fb152017875e90855c7bb6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Albert221 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
