jenkins-bot has submitted this change and it was merged.
Change subject: VisualEditor integration: Fix handling of (None) language
......................................................................
VisualEditor integration: Fix handling of (None) language
Change-Id: I6a5ca5db218d8497eed5dfb61b5a5acb4bb0c122
---
M modules/VisualEditor/ve.dm.MWSyntaxHighlightNode.js
M modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
2 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/VisualEditor/ve.dm.MWSyntaxHighlightNode.js
b/modules/VisualEditor/ve.dm.MWSyntaxHighlightNode.js
index 6f14a06..a3ea959 100644
--- a/modules/VisualEditor/ve.dm.MWSyntaxHighlightNode.js
+++ b/modules/VisualEditor/ve.dm.MWSyntaxHighlightNode.js
@@ -47,7 +47,7 @@
};
( function () {
- var supportedLanguages = [];
+ var supportedLanguages = [ undefined ];
/**
* Register supported languages.
@@ -65,7 +65,7 @@
* @return {boolean} The language is supported
*/
ve.dm.MWSyntaxHighlightNode.static.isLanguageSupported = function (
language ) {
- return supportedLanguages.indexOf( language ) !== -1;
+ return supportedLanguages.indexOf( language || undefined ) !==
-1;
};
/**
diff --git a/modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
b/modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
index 285fccb..0132362 100644
--- a/modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
+++ b/modules/VisualEditor/ve.ui.MWSyntaxHighlightInspector.js
@@ -51,14 +51,12 @@
this.language = new OO.ui.ComboBoxWidget( {
menu: {
filterFromInput: true,
- items: [ new OO.ui.MenuOptionWidget( { data: '', label:
noneMsg } ) ].concat(
- $.map(
ve.dm.MWSyntaxHighlightNode.static.getLanguages(), function ( lang ) {
- return new OO.ui.MenuOptionWidget( {
data: lang, label: lang } );
- } )
- )
+ items: $.map(
ve.dm.MWSyntaxHighlightNode.static.getLanguages(), function ( lang ) {
+ return new OO.ui.MenuOptionWidget( { data:
lang, label: lang || noneMsg } );
+ } )
},
input: { validate: function ( input ) {
- return input === '' ||
ve.dm.MWSyntaxHighlightNode.static.isLanguageSupported( input );
+ return
ve.dm.MWSyntaxHighlightNode.static.isLanguageSupported( input );
} }
} );
this.language.getInput().connect( this, { change:
'onLanguageInputChange' } );
--
To view, visit https://gerrit.wikimedia.org/r/238830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a5ca5db218d8497eed5dfb61b5a5acb4bb0c122
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
