From 611d0f46104c107723cd8ff70f7b7b8bfbd12b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Tue, 25 Jun 2019 14:59:04 +0200 Subject: [PATCH] Use npm package text-encoding to fix IE11/Edge login. IE11/Edge does not support TextDecoder/TextEncoder. Solved by using the npm package 'text-encoding'. --- client/package.json | 1 + client/src/app/core/core-services/websocket.service.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index 51c76593d..6e108496c 100644 --- a/client/package.json +++ b/client/package.json @@ -61,6 +61,7 @@ "pdfmake": "^0.1.53", "po2json": "^1.0.0-alpha", "rxjs": "^6.5.1", + "text-encoding": "^0.7.0", "tinymce": "^4.9.2", "uuid": "^3.3.2", "zone.js": "~0.8.26" diff --git a/client/src/app/core/core-services/websocket.service.ts b/client/src/app/core/core-services/websocket.service.ts index 4b46ccfeb..def28c1f6 100644 --- a/client/src/app/core/core-services/websocket.service.ts +++ b/client/src/app/core/core-services/websocket.service.ts @@ -6,6 +6,7 @@ import { TranslateService } from '@ngx-translate/core'; import { Observable, Subject } from 'rxjs'; import { take } from 'rxjs/operators'; import { compress, decompress } from 'lz4js'; +import { TextDecoder, TextEncoder } from 'text-encoding'; import { formatQueryParams, QueryParams } from '../query-params'; import { OpenSlidesStatusService } from './openslides-status.service'; @@ -281,7 +282,7 @@ export class WebsocketService { 1024} KB uncompressed), ratio ${decompressedBuffer.byteLength / compressedSize}` ); const textDecoder = new TextDecoder(); - data = textDecoder.decode(decompressedBuffer); + data = textDecoder.decode(decompressedBuffer) as string; } const message: IncommingWebsocketMessage = JSON.parse(data);