From 5c0b5ef74bda71ff7edafb1101b37b47b027f044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?gr=C3=A9goire=20parant?= Date: Thu, 29 Apr 2021 01:26:09 +0200 Subject: [PATCH 1/2] HotFix release v1.3.1 (#958) - Update camera style support mobile - Fix admin console error --- front/dist/resources/style/style.css | 1 + front/package.json | 2 +- .../ConsoleGlobalMessageManager.ts | 63 ++++++++++--------- front/yarn.lock | 12 ++-- 4 files changed, 41 insertions(+), 37 deletions(-) diff --git a/front/dist/resources/style/style.css b/front/dist/resources/style/style.css index 7db93329..97e363f9 100644 --- a/front/dist/resources/style/style.css +++ b/front/dist/resources/style/style.css @@ -141,6 +141,7 @@ body .message-info.warning{ right: 15px; bottom: 30px; border-radius: 15px 15px 15px 15px; + max-height: 200px; } video#myCamVideo{ diff --git a/front/package.json b/front/package.json index 6189ff4c..df017daa 100644 --- a/front/package.json +++ b/front/package.json @@ -33,7 +33,7 @@ "phaser": "3.24.1", "phaser3-rex-plugins": "^1.1.42", "queue-typescript": "^1.0.1", - "quill": "^1.3.7", + "quill": "1.3.6", "rxjs": "^6.6.3", "simple-peer": "^9.6.2", "socket.io-client": "^2.3.0", diff --git a/front/src/Administration/ConsoleGlobalMessageManager.ts b/front/src/Administration/ConsoleGlobalMessageManager.ts index 3aed39ac..c1d0fba9 100644 --- a/front/src/Administration/ConsoleGlobalMessageManager.ts +++ b/front/src/Administration/ConsoleGlobalMessageManager.ts @@ -2,7 +2,6 @@ import {HtmlUtils} from "../WebRtc/HtmlUtils"; import {UserInputManager} from "../Phaser/UserInput/UserInputManager"; import {RoomConnection} from "../Connexion/RoomConnection"; import {PlayGlobalMessageInterface} from "../Connexion/ConnexionModels"; -import {ADMIN_URL} from "../Enum/EnvironmentVariable"; import {AdminMessageEventTypes} from "../Connexion/AdminMessagesService"; export const CLASS_CONSOLE_MESSAGE = 'main-console'; @@ -162,42 +161,46 @@ export class ConsoleGlobalMessageManager { this.divMessageConsole.appendChild(section); (async () => { - // Start loading CSS - const cssPromise = ConsoleGlobalMessageManager.loadCss(); - // Import quill - const Quill:any = await import("quill"); // eslint-disable-line @typescript-eslint/no-explicit-any - // Wait for CSS to be loaded - await cssPromise; + try{ + // Start loading CSS + const cssPromise = ConsoleGlobalMessageManager.loadCss(); + // Import quill + const {default: Quill}:any = await import("quill"); // eslint-disable-line @typescript-eslint/no-explicit-any + // Wait for CSS to be loaded + await cssPromise; - const toolbarOptions = [ - ['bold', 'italic', 'underline', 'strike'], // toggled buttons - ['blockquote', 'code-block'], + const toolbarOptions = [ + ['bold', 'italic', 'underline', 'strike'], // toggled buttons + ['blockquote', 'code-block'], - [{'header': 1}, {'header': 2}], // custom button values - [{'list': 'ordered'}, {'list': 'bullet'}], - [{'script': 'sub'}, {'script': 'super'}], // superscript/subscript - [{'indent': '-1'}, {'indent': '+1'}], // outdent/indent - [{'direction': 'rtl'}], // text direction + [{'header': 1}, {'header': 2}], // custom button values + [{'list': 'ordered'}, {'list': 'bullet'}], + [{'script': 'sub'}, {'script': 'super'}], // superscript/subscript + [{'indent': '-1'}, {'indent': '+1'}], // outdent/indent + [{'direction': 'rtl'}], // text direction - [{'size': ['small', false, 'large', 'huge']}], // custom dropdown - [{'header': [1, 2, 3, 4, 5, 6, false]}], + [{'size': ['small', false, 'large', 'huge']}], // custom dropdown + [{'header': [1, 2, 3, 4, 5, 6, false]}], - [{'color': []}, {'background': []}], // dropdown with defaults from theme - [{'font': []}], - [{'align': []}], + [{'color': []}, {'background': []}], // dropdown with defaults from theme + [{'font': []}], + [{'align': []}], - ['clean'], + ['clean'], - ['link', 'image', 'video'] - // remove formatting button - ]; + ['link', 'image', 'video'] + // remove formatting button + ]; - new Quill(`#${INPUT_CONSOLE_MESSAGE}`, { - theme: 'snow', - modules: { - toolbar: toolbarOptions - }, - }); + new Quill(`#${INPUT_CONSOLE_MESSAGE}`, { + theme: 'snow', + modules: { + toolbar: toolbarOptions + }, + }); + }catch(err){ + console.error(err); + } })(); } diff --git a/front/yarn.lock b/front/yarn.lock index 26573239..739e713e 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -1942,7 +1942,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@^3.0.2: +extend@^3.0.1, extend@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -4026,15 +4026,15 @@ quill-delta@^3.6.2: extend "^3.0.2" fast-diff "1.1.2" -quill@^1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/quill/-/quill-1.3.7.tgz#da5b2f3a2c470e932340cdbf3668c9f21f9286e8" - integrity sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g== +quill@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/quill/-/quill-1.3.6.tgz#99f4de1fee85925a0d7d4163b6d8328f23317a4d" + integrity sha512-K0mvhimWZN6s+9OQ249CH2IEPZ9JmkFuCQeHAOQax3EZ2nDJ3wfGh59mnlQaZV2i7u8eFarx6wAtvQKgShojug== dependencies: clone "^2.1.1" deep-equal "^1.0.1" eventemitter3 "^2.0.3" - extend "^3.0.2" + extend "^3.0.1" parchment "^1.1.4" quill-delta "^3.6.2" From 19ae575b4fb95cc0455c7aa533f674a2388ff3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?gr=C3=A9goire=20parant?= Date: Thu, 29 Apr 2021 01:49:09 +0200 Subject: [PATCH 2/2] HotFix style help modal (#960) --- front/dist/resources/html/helpCameraSettings.html | 1 + 1 file changed, 1 insertion(+) diff --git a/front/dist/resources/html/helpCameraSettings.html b/front/dist/resources/html/helpCameraSettings.html index 64740406..a04668fe 100644 --- a/front/dist/resources/html/helpCameraSettings.html +++ b/front/dist/resources/html/helpCameraSettings.html @@ -11,6 +11,7 @@ max-height: calc(48vh - 50px); max-width: 48vw; overflow: hidden; + overflow-y: scroll; } #helpCameraSettings h1 { background-image: linear-gradient(top, #f1f3f3, #d4dae0);