Better SVG support for markdown and rich text.

frontend/app/shared/components/forms/markdown-editor.component.ts

@@ -197,23 +197,7 @@ export class MarkdownEditorComponent extends StatefulControlComponent<State, str
     }
 
     public insertAssets(assets: ReadonlyArray<AssetDto>) {
-        let content = '';
+        const content = this.buildMarkups(assets);
-
-        for (const asset of assets) {
-            const name = asset.fileNameWithoutExtension;
-
-            switch (asset.type) {
-                case 'Image':
-                    content += `![${name}](${asset.fullUrl(this.apiUrl)} '${name}')`;
-                    break;
-                case 'Video':
-                    content += `[${name}](${asset.fullUrl(this.apiUrl)}')`;
-                    break;
-                default:
-                    content += `[${name}](${asset.fullUrl(this.apiUrl)}')`;
-                    break;
-            }
-        }
 
         if (content.length > 0) {
             this.simplemde.codemirror.replaceSelection(content);
@@ -259,9 +243,7 @@ export class MarkdownEditorComponent extends StatefulControlComponent<State, str
         this.assetUploader.uploadFile(file)
             .subscribe(asset => {
                 if (Types.is(asset, AssetDto)) {
-                    const name = asset.fileNameWithoutExtension;
+                    replaceText(this.buildMarkup(asset));
-
-                    replaceText(`![${name}](${asset.fullUrl(this.apiUrl)} '${name}')`);
                 }
             }, error => {
                 if (!Types.is(error, UploadCanceled)) {
@@ -281,4 +263,26 @@ export class MarkdownEditorComponent extends StatefulControlComponent<State, str
 
         this.next({ isFullscreen });
     }
+
+    private buildMarkups(assets: readonly AssetDto[]) {
+        let content = '';
+
+        for (const asset of assets) {
+            content += this.buildMarkup(asset);
+        }
+
+        return content;
+    }
+
+    private buildMarkup(asset: AssetDto) {
+        const name = asset.fileNameWithoutExtension;
+
+        if (asset.type === 'Image' || asset.mimeType === 'image/svg+xml' || asset.fileName.endsWith('.svg')) {
+            return `![${name}](${asset.fullUrl(this.apiUrl)} '${name}')`;
+        } else if (asset.type === 'Video') {
+            return `[${name}](${asset.fullUrl(this.apiUrl)}')`;
+        } else {
+            return `[${name}](${asset.fullUrl(this.apiUrl)}')`;
+        }
+    }
 }

frontend/app/shared/components/forms/rich-editor.component.ts

@@ -17,13 +17,6 @@ export const SQX_RICH_EDITOR_CONTROL_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => RichEditorComponent), multi: true
 };
 
-const ImageTypes: ReadonlyArray<any> = [
-    'image/jpeg',
-    'image/png',
-    'image/jpg',
-    'image/gif'
-];
-
 @Component({
     selector: 'sqx-rich-editor',
     styleUrls: ['./rich-editor.component.scss'],
@@ -138,7 +131,7 @@ export class RichEditorComponent extends StatefulControlComponent<{}, string> im
                         for (let i = 0; i < event.clipboardData.items.length; i++) {
                             const file = event.clipboardData.items[i].getAsFile();
 
-                            if (file && ImageTypes.indexOf(file.type) >= 0) {
+                            if (file) {
                                 self.uploadFile(file);
 
                                 hasFileDropped = true;
@@ -160,7 +153,7 @@ export class RichEditorComponent extends StatefulControlComponent<{}, string> im
                         for (let i = 0; i < event.dataTransfer.files.length; i++) {
                             const file = event.dataTransfer.files.item(i);
 
-                            if (file && ImageTypes.indexOf(file.type) >= 0) {
+                            if (file) {
                                 self.uploadFile(file);
 
                                 hasFileDropped = true;
@@ -219,23 +212,7 @@ export class RichEditorComponent extends StatefulControlComponent<{}, string> im
     }
 
     public insertAssets(assets: ReadonlyArray<AssetDto>) {
-        let content = '';
+        const content = this.buildMarkups(assets);
-
-        for (const asset of assets) {
-            const name = asset.fileNameWithoutExtension;
-
-            switch (asset.type) {
-                case 'Image':
-                    content += `<img src="${asset.fullUrl(this.apiUrl)}" alt="${name}" />`;
-                    break;
-                case 'Video':
-                    content += `<video src="${asset.fullUrl(this.apiUrl)}" />`;
-                    break;
-                default:
-                    content += `<a href="${asset.fullUrl(this.apiUrl)}" alt="${name}">${name}</a>`;
-                    break;
-            }
-        }
 
         if (content.length > 0) {
             this.tinyEditor.execCommand('mceInsertContent', false, content);
@@ -264,13 +241,7 @@ export class RichEditorComponent extends StatefulControlComponent<{}, string> im
         this.assetUploader.uploadFile(file)
             .subscribe(asset => {
                 if (Types.is(asset, AssetDto)) {
-                    const name = asset.fileNameWithoutExtension;
+                        replaceText(this.buildMarkup(asset));
-
-                    if (asset.type === 'Video') {
-                        replaceText(`<video src="${asset.fullUrl(this.apiUrl)}" />`);
-                    } else {
-                        replaceText(`<img src="${asset.fullUrl(this.apiUrl)}" alt="${name}" />`);
-                    }
                 }
             }, error => {
                 if (!Types.is(error, UploadCanceled)) {
@@ -278,6 +249,28 @@ export class RichEditorComponent extends StatefulControlComponent<{}, string> im
                 }
             });
     }
+
+    private buildMarkups(assets: readonly AssetDto[]) {
+        let content = '';
+
+        for (const asset of assets) {
+            content += this.buildMarkup(asset);
+        }
+
+        return content;
+    }
+
+    private buildMarkup(asset: AssetDto) {
+        const name = asset.fileNameWithoutExtension;
+
+        if (asset.type === 'Image' || asset.mimeType === 'image/svg+xml' || asset.fileName.endsWith('.svg')) {
+            return `<img src="${asset.fullUrl(this.apiUrl)}" alt="${name}" />`;
+        } else if (asset.type === 'Video') {
+            return `<video src="${asset.fullUrl(this.apiUrl)}" />`;
+        } else {
+            return `<a href="${asset.fullUrl(this.apiUrl)}" alt="${name}">${name}</a>`;
+        }
+    }
 }
 
 const DEFAULT_PROPS = {