diff --git a/client/modules/IDE/components/Editor/index.jsx b/client/modules/IDE/components/Editor/index.jsx index cd060d3bb5..87f456a126 100644 --- a/client/modules/IDE/components/Editor/index.jsx +++ b/client/modules/IDE/components/Editor/index.jsx @@ -338,7 +338,7 @@ class Editor extends React.Component { mode = 'application/json'; } else if (fileName.match(/.+\.(frag|glsl)$/i)) { mode = 'x-shader/x-fragment'; - } else if (fileName.match(/.+\.(vert|stl)$/i)) { + } else if (fileName.match(/.+\.(vert|stl|mtl)$/i)) { mode = 'x-shader/x-vertex'; } else { mode = 'text/plain'; diff --git a/server/utils/fileUtils.js b/server/utils/fileUtils.js index 32a7a0e032..cd718a27b8 100644 --- a/server/utils/fileUtils.js +++ b/server/utils/fileUtils.js @@ -40,7 +40,8 @@ export const fileExtensionsArray = [ 'frag', 'bin', 'xml', - 'stl' + 'stl', + 'mtl' ]; export const mimeTypes = `image/*,audio/*,text/javascript,text/html,text/css, @@ -66,10 +67,10 @@ export const MEDIA_FILE_QUOTED_REGEX = new RegExp( export const STRING_REGEX = /(['"])((\\\1|.)*?)\1/gm; // these are files that have to be linked to with a blob url -export const PLAINTEXT_FILE_REGEX = /.+\.(json|txt|csv|vert|frag|tsv|xml|stl)$/i; +export const PLAINTEXT_FILE_REGEX = /.+\.(json|txt|csv|vert|frag|tsv|xml|stl|mtl)$/i; // these are files that users would want to edit as text (maybe svg should be here?) -export const TEXT_FILE_REGEX = /.+\.(json|txt|csv|tsv|vert|frag|js|css|html|htm|jsx|xml|stl)$/i; +export const TEXT_FILE_REGEX = /.+\.(json|txt|csv|tsv|vert|frag|js|css|html|htm|jsx|xml|stl|mtl)$/i; export const NOT_EXTERNAL_LINK_REGEX = /^(?!(http:\/\/|https:\/\/))/; export const EXTERNAL_LINK_REGEX = /^(http:\/\/|https:\/\/)/; -export const CREATE_FILE_REGEX = /.+\.(json|txt|csv|tsv|js|css|frag|vert|xml|html|htm|stl)$/i; +export const CREATE_FILE_REGEX = /.+\.(json|txt|csv|tsv|js|css|frag|vert|xml|html|htm|stl|mtl)$/i; diff --git a/translations/locales/be/translations.json b/translations/locales/be/translations.json index 4b81e4794c..04bf51f10a 100644 --- a/translations/locales/be/translations.json +++ b/translations/locales/be/translations.json @@ -249,7 +249,7 @@ "Title": "ফাইল তৈরি করুন", "CloseButtonARIA": "নতুন ফাইল মোডাল বন্ধ করুন", "EnterName": "নাম লিখুন", - "InvalidType": "অবৈধ ফাইল ধরন। বৈধ এক্সটেনশনগুলি হলো .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .frag এবং .vert." + "InvalidType": "অবৈধ ফাইল ধরন। বৈধ এক্সটেনশনগুলি হলো .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .mtl, .frag এবং .vert." }, "NewFileForm": { "AddFileSubmit": "ফাইল যোগ করুন", diff --git a/translations/locales/en-US/translations.json b/translations/locales/en-US/translations.json index 45afb19bed..d227418ba7 100644 --- a/translations/locales/en-US/translations.json +++ b/translations/locales/en-US/translations.json @@ -254,7 +254,7 @@ "Title": "Create File", "CloseButtonARIA": "Close New File Modal", "EnterName": "Please enter a name", - "InvalidType": "Invalid file type. Valid extensions are .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .frag, and .vert." + "InvalidType": "Invalid file type. Valid extensions are .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .mtl, .frag, and .vert." }, "NewFileForm": { "AddFileSubmit": "Add File", diff --git a/translations/locales/es-419/translations.json b/translations/locales/es-419/translations.json index 1c0faf6f6a..778787d8cb 100644 --- a/translations/locales/es-419/translations.json +++ b/translations/locales/es-419/translations.json @@ -243,7 +243,7 @@ "Title": "Crear Archivo", "CloseButtonARIA": "Cerrar diálogo de crear archivo", "EnterName": "Por favor introduce un nombre", - "InvalidType": "Tipo de archivo inválido. Las extensiones válidas son .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .frag y .vert." + "InvalidType": "Tipo de archivo inválido. Las extensiones válidas son .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .mtl, .frag y .vert." }, "NewFileForm": { "AddFileSubmit": "Agregar Archivo", diff --git a/translations/locales/hi/translations.json b/translations/locales/hi/translations.json index ef119aa697..e13634efca 100644 --- a/translations/locales/hi/translations.json +++ b/translations/locales/hi/translations.json @@ -255,7 +255,7 @@ "Title": "फ़ाइल बनाएँ", "CloseButtonARIA": "नई फ़ाइल मोडल बंद करें", "EnterName": "कृपया एक नाम दर्ज करें", - "InvalidType": "अमान्य फ़ाइल प्रकार। मान्य एक्सटेंशन हैं .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .frag, और .vert." + "InvalidType": "अमान्य फ़ाइल प्रकार। मान्य एक्सटेंशन हैं .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .mtl, .frag, और .vert." }, "NewFileForm": { "AddFileSubmit": "फाइल जोडें", diff --git a/translations/locales/ja/translations.json b/translations/locales/ja/translations.json index 61d9fe28a4..f43b64f009 100644 --- a/translations/locales/ja/translations.json +++ b/translations/locales/ja/translations.json @@ -243,7 +243,7 @@ "Title": "ファイル作成", "CloseButtonARIA": "新規ファイルモーダルを閉じる", "EnterName": "ファイル名を入力してください", - "InvalidType": "ファイルタイプが無効です。有効な拡張子は、.js、.css、.json、.xml、.stl、.txt、.csv、.tsv、.frag、.vertです。" + "InvalidType": "ファイルタイプが無効です。有効な拡張子は、.js、.css、.json、.xml、.stl、.txt、.csv、.tsv、.mtl、.frag、.vertです。" }, "NewFileForm": { "AddFileSubmit": "ファイルを追加",