Media box: Get mime type from blob info

src/directives/mediabox.ts

@@ -53,10 +53,11 @@ export default [
                 };
 
                 // Listen to Mediabox service events
-                const filter = $filter('bufferToUrl') as (buffer: ArrayBuffer, mimeType: string) => string;
+                const bufferToUrl = $filter('bufferToUrl') as
+                    (buffer: ArrayBuffer, mimeType: string, trust: boolean) => string;
                 mediaboxService.evtMediaChanged.attach((dataAvailable: boolean) => {
                     $rootScope.$apply(() => {
-                        this.imageDataUrl = filter(mediaboxService.data, 'image/jpeg');
+                        this.imageDataUrl = bufferToUrl(mediaboxService.data, mediaboxService.mimetype, true);
                         this.caption = mediaboxService.caption || mediaboxService.filename;
                     });
                 });

src/filters.ts

@@ -237,7 +237,18 @@ angular.module('3ema.filters', [])
         for (let i = 0; i < len; i++) {
             binary += String.fromCharCode(bytes[i]);
         }
-        const uri = 'data:' + mimeType + ';base64,' +  btoa(binary);
+        switch (mimeType) {
+            case 'image/jpeg':
+            case 'image/png':
+            case 'image/webp':
+                // OK
+                break;
+            default:
+                $log.warn(logTag, 'Unknown mimeType: ' + mimeType);
+                mimeType = 'image/jpeg';
+                break;
+        }
+        const uri = 'data:' + mimeType + ';base64,' + btoa(binary);
         if (trust) {
             return $sce.trustAsResourceUrl(uri);
         } else {

src/services/mediabox.ts

@@ -39,6 +39,7 @@ export class MediaboxService {
     public data: ArrayBuffer | null = null;
     public caption: string = '';
     public filename: string = '';
+    public mimetype: string = '';
 
     public static $inject = ['$log'];
     constructor($log: ng.ILogService) {
@@ -48,10 +49,11 @@ export class MediaboxService {
     /**
      * Update media data.
      */
-    public setMedia(data: ArrayBuffer, filename: string, caption: string) {
+    public setMedia(data: ArrayBuffer, filename: string, mimetype: string, caption: string) {
         this.$log.debug(this.logTag, 'Media data updated');
         this.data = data;
         this.filename = filename;
+        this.mimetype = mimetype;
         this.caption = caption;
         this.evtMediaChanged.post(data !== null);
     }
@@ -63,6 +65,7 @@ export class MediaboxService {
         this.$log.debug(this.logTag, 'Media data cleared');
         this.data = null;
         this.filename = '';
+        this.mimetype = '';
         this.caption = '';
         this.evtMediaChanged.post(false);
     }