瀏覽代碼

MessageMedia directive: Remove filters.bufferToUrl

Replace it with a direct helpers.bufferToUrl call.
Danilo Bargen 7 年之前
父節點
當前提交
4950de4690
共有 1 個文件被更改,包括 13 次插入14 次删除
  1. 13 14
      src/directives/message_media.ts

+ 13 - 14
src/directives/message_media.ts

@@ -115,27 +115,26 @@ export default [
                         this.thumbnail = null;
                     } else {
                         if (this.thumbnail === null) {
-                            const bufferToUrlFilter = $filter<any>('bufferToUrl');
-                            if (this.message.thumbnail.img !== undefined) {
-                                this.thumbnail = bufferToUrlFilter(
-                                    this.message.thumbnail.img,
+                            const setThumbnail = (buf: ArrayBuffer) => {
+                                this.thumbnail = bufferToUrl(
+                                    buf,
                                     webClientService.appCapabilities.imageFormat.thumbnail,
+                                    logAdapter($log.warn, this.logTag),
                                 );
+                            };
+
+                            if (this.message.thumbnail.img !== undefined) {
+                                setThumbnail(this.message.thumbnail.img);
                                 return;
                             } else {
                                 this.thumbnailDownloading = true;
                                 loadingThumbnailTimeout = $timeout(() => {
-                                    webClientService.requestThumbnail(
-                                        this.receiver,
-                                        this.message).then((img) => {
-                                        $timeout(() => {
-                                            this.thumbnail = bufferToUrlFilter(
-                                                img,
-                                                webClientService.appCapabilities.imageFormat.thumbnail,
-                                            );
+                                    webClientService
+                                        .requestThumbnail(this.receiver, this.message)
+                                        .then((img) => $timeout(() => {
+                                            setThumbnail(img);
                                             this.thumbnailDownloading = false;
-                                        });
-                                    });
+                                        }));
                                 }, 1000);
                             }
                         }