diff --git a/src/public/app/services/mime_types.js b/src/public/app/services/mime_types.js index 1e25b5a4d..6293e7e61 100644 --- a/src/public/app/services/mime_types.js +++ b/src/public/app/services/mime_types.js @@ -189,17 +189,22 @@ function getHighlightJsNameForMime(mimeType) { mimeToHighlightJsMapping = {}; for (const mimeType of mimeTypes) { // The mime stored by CKEditor is text-x-csrc instead of text/x-csrc so we keep this format for faster lookup. - const normalizedMime = mimeType.mime.replace(/\//g, "-"); + const normalizedMime = normalizeMimeTypeForCKEditor(mimeType.mime); mimeToHighlightJsMapping[normalizedMime] = mimeType.highlightJs; } } - console.log("Mappings ", mimeToHighlightJsMapping); return mimeToHighlightJsMapping[mimeType]; } +function normalizeMimeTypeForCKEditor(mimeType) { + return mimeType.toLowerCase() + .replace(/[\W_]+/g,"-"); +} + export default { getMimeTypes, loadMimeTypes, - getHighlightJsNameForMime + getHighlightJsNameForMime, + normalizeMimeTypeForCKEditor } diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js index 0a20e9bc6..6f939c801 100644 --- a/src/public/app/widgets/type_widgets/editable_text.js +++ b/src/public/app/widgets/type_widgets/editable_text.js @@ -112,7 +112,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget { (mimeTypesService.getMimeTypes()) .filter(mt => mt.enabled) .map(mt => ({ - language: mt.mime.toLowerCase().replace(/[\W_]+/g,"-"), + language: mimeTypesService.normalizeMimeTypeForCKEditor(mt.mime), label: mt.title }));