merge develop

Author: catarak

client/components/__test__/Nav.test.jsx

@@ -46,7 +46,8 @@ describe('Nav', () => {
     },
     t: jest.fn(),
     setLanguage: jest.fn(),
-    language: 'en-US'
+    language: 'en-US',
+    isUserOwner: true
   };
 
   it('renders correctly', () => {

client/modules/IDE/components/Editor.jsx

@@ -284,7 +284,7 @@ class Editor extends React.Component {
       mode = 'javascript';
     } else if (fileName.match(/.+\.css$/i)) {
       mode = 'css';
-    } else if (fileName.match(/.+\.html$/i)) {
+    } else if (fileName.match(/.+\.(html|xml)$/i)) {
       mode = 'htmlmixed';
     } else if (fileName.match(/.+\.json$/i)) {
       mode = 'application/json';

client/styles/components/_toolbar.scss

@@ -149,6 +149,11 @@
 	font-size: #{12 / $base-font-size}rem;
 }
 
+.toolbar__autorefresh {
+	display: flex;
+	align-items: center;
+}
+
 .checkbox__autorefresh{
 	cursor: pointer;
 }

server/utils/fileUtils.js

@@ -38,12 +38,13 @@ export const fileExtensionsArray = [
   'mov',
   'vert',
   'frag',
-  'bin'
+  'bin',
+  'xml'
 ];
 
 export const mimeTypes = `image/*,audio/*,text/javascript,text/html,text/css,
 application/json,application/x-font-ttf,application/x-font-truetype,text/plain,
-text/csv,.obj,video/webm,video/ogg,video/quicktime,video/mp4`;
+text/csv,.obj,video/webm,video/ogg,video/quicktime,video/mp4,application/xml`;
 
 export const fileExtensions = fileExtensionsArray
   .map((ext) => `.${ext}`)
@@ -64,10 +65,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)$/i;
+export const PLAINTEXT_FILE_REGEX = /.+\.(json|txt|csv|vert|frag|tsv|xml)$/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)$/i;
+export const TEXT_FILE_REGEX = /.+\.(json|txt|csv|tsv|vert|frag|js|css|html|htm|jsx|xml)$/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|html|htm)$/i;
+export const CREATE_FILE_REGEX = /.+\.(json|txt|csv|tsv|js|css|frag|vert|xml|html|htm)$/i;

translations/locales/en-US/translations.json

@@ -238,7 +238,7 @@
     "Title": "Create File",
     "CloseButtonARIA": "Close New File Modal",
     "EnterName": "Please enter a name",
-    "InvalidType": "Invalid file type. Valid extensions are .js, .css, .json, .txt, .csv, .tsv, .frag, and .vert."
+    "InvalidType": "Invalid file type. Valid extensions are .js, .css, .json, .xml, .txt, .csv, .tsv, .frag, and .vert."
   },
   "NewFileForm": {
     "AddFileSubmit": "Add File",

translations/locales/es-419/translations.json

@@ -238,7 +238,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, .txt, .csv, .tsv, .frag y .vert."
+    "InvalidType": "Tipo de archivo inválido. Las extensiones válidas son .js, .css, .json, .xml, .txt, .csv, .tsv, .frag y .vert."
   },
   "NewFileForm": {
     "AddFileSubmit": "Agregar Archivo",

translations/locales/hi/translations.json

@@ -238,7 +238,7 @@
       "Title": "फ़ाइल बनाएँ",
       "CloseButtonARIA": "नई फ़ाइल मोडल बंद करें",
       "EnterName": "कृपया एक नाम दर्ज करें",
-      "InvalidType": "अमान्य फ़ाइल प्रकार। मान्य एक्सटेंशन हैं .js, .css, .json, .txt, .csv, .tsv, .frag, और .vert."
+      "InvalidType": "अमान्य फ़ाइल प्रकार। मान्य एक्सटेंशन हैं .js, .css, .json, .xml, .txt, .csv, .tsv, .frag, और .vert."
     },
     "NewFileForm": {
       "AddFileSubmit": "फाइल जोडें",

translations/locales/ja/translations.json

@@ -238,7 +238,7 @@
       "Title": "ファイル作成",
       "CloseButtonARIA": "新規ファイルモーダルを閉じる",
       "EnterName": "ファイル名を入力してください",
-      "InvalidType": "ファイルタイプが無効です。有効な拡張子は、.js、.css、.json、.txt、.csv、.tsv、.frag、.vertです。"
+      "InvalidType": "ファイルタイプが無効です。有効な拡張子は、.js、.css、.json、.xml、.txt、.csv、.tsv、.frag、.vertです。"
     },
     "NewFileForm": {
       "AddFileSubmit": "ファイルを追加",