Skip to content

Commit c864b8a

Browse files
authored
Merge pull request #1988 from akshatnema/akshat-patch-1
added functionality of .stl files
2 parents d247600 + 436b21a commit c864b8a

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

client/modules/IDE/components/Editor.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ class Editor extends React.Component {
312312
mode = 'application/json';
313313
} else if (fileName.match(/.+\.(frag|glsl)$/i)) {
314314
mode = 'x-shader/x-fragment';
315-
} else if (fileName.match(/.+\.(vert)$/i)) {
315+
} else if (fileName.match(/.+\.(vert|stl)$/i)) {
316316
mode = 'x-shader/x-vertex';
317317
} else {
318318
mode = 'text/plain';

server/utils/fileUtils.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@ export const fileExtensionsArray = [
3939
'vert',
4040
'frag',
4141
'bin',
42-
'xml'
42+
'xml',
43+
'stl'
4344
];
4445

4546
export const mimeTypes = `image/*,audio/*,text/javascript,text/html,text/css,
4647
application/json,application/x-font-ttf,application/x-font-truetype,text/plain,
47-
text/csv,.obj,video/webm,video/ogg,video/quicktime,video/mp4,application/xml`;
48+
text/csv,.obj,video/webm,video/ogg,video/quicktime,video/mp4,application/xml,.stl`;
4849

4950
export const fileExtensions = fileExtensionsArray
5051
.map((ext) => `.${ext}`)
@@ -65,10 +66,10 @@ export const MEDIA_FILE_QUOTED_REGEX = new RegExp(
6566

6667
export const STRING_REGEX = /(['"])((\\\1|.)*?)\1/gm;
6768
// these are files that have to be linked to with a blob url
68-
export const PLAINTEXT_FILE_REGEX = /.+\.(json|txt|csv|vert|frag|tsv|xml)$/i;
69+
export const PLAINTEXT_FILE_REGEX = /.+\.(json|txt|csv|vert|frag|tsv|xml|stl)$/i;
6970
// these are files that users would want to edit as text (maybe svg should be here?)
70-
export const TEXT_FILE_REGEX = /.+\.(json|txt|csv|tsv|vert|frag|js|css|html|htm|jsx|xml)$/i;
71+
export const TEXT_FILE_REGEX = /.+\.(json|txt|csv|tsv|vert|frag|js|css|html|htm|jsx|xml|stl)$/i;
7172
export const NOT_EXTERNAL_LINK_REGEX = /^(?!(http:\/\/|https:\/\/))/;
7273
export const EXTERNAL_LINK_REGEX = /^(http:\/\/|https:\/\/)/;
7374

74-
export const CREATE_FILE_REGEX = /.+\.(json|txt|csv|tsv|js|css|frag|vert|xml|html|htm)$/i;
75+
export const CREATE_FILE_REGEX = /.+\.(json|txt|csv|tsv|js|css|frag|vert|xml|html|htm|stl)$/i;

translations/locales/en-US/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
"Title": "Create File",
241241
"CloseButtonARIA": "Close New File Modal",
242242
"EnterName": "Please enter a name",
243-
"InvalidType": "Invalid file type. Valid extensions are .js, .css, .json, .xml, .txt, .csv, .tsv, .frag, and .vert."
243+
"InvalidType": "Invalid file type. Valid extensions are .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .frag, and .vert."
244244
},
245245
"NewFileForm": {
246246
"AddFileSubmit": "Add File",

translations/locales/es-419/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"Title": "Crear Archivo",
235235
"CloseButtonARIA": "Cerrar diálogo de crear archivo",
236236
"EnterName": "Por favor introduce un nombre",
237-
"InvalidType": "Tipo de archivo inválido. Las extensiones válidas son .js, .css, .json, .xml, .txt, .csv, .tsv, .frag y .vert."
237+
"InvalidType": "Tipo de archivo inválido. Las extensiones válidas son .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .frag y .vert."
238238
},
239239
"NewFileForm": {
240240
"AddFileSubmit": "Agregar Archivo",

translations/locales/hi/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"Title": "फ़ाइल बनाएँ",
235235
"CloseButtonARIA": "नई फ़ाइल मोडल बंद करें",
236236
"EnterName": "कृपया एक नाम दर्ज करें",
237-
"InvalidType": "अमान्य फ़ाइल प्रकार। मान्य एक्सटेंशन हैं .js, .css, .json, .xml, .txt, .csv, .tsv, .frag, और .vert."
237+
"InvalidType": "अमान्य फ़ाइल प्रकार। मान्य एक्सटेंशन हैं .js, .css, .json, .xml, .stl, .txt, .csv, .tsv, .frag, और .vert."
238238
},
239239
"NewFileForm": {
240240
"AddFileSubmit": "फाइल जोडें",

translations/locales/ja/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"Title": "ファイル作成",
235235
"CloseButtonARIA": "新規ファイルモーダルを閉じる",
236236
"EnterName": "ファイル名を入力してください",
237-
"InvalidType": "ファイルタイプが無効です。有効な拡張子は、.js、.css、.json、.xml、.txt、.csv、.tsv、.frag、.vertです。"
237+
"InvalidType": "ファイルタイプが無効です。有効な拡張子は、.js、.css、.json、.xml、.stl、.txt、.csv、.tsv、.frag、.vertです。"
238238
},
239239
"NewFileForm": {
240240
"AddFileSubmit": "ファイルを追加",

0 commit comments

Comments
 (0)