diff --git a/package.json b/package.json index b9387a46..ed7339bf 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "author": "Miroslav Pejic", "license": "AGPL-3.0", "dependencies": { - "@sentry/integrations": "7.60.0", - "@sentry/node": "7.60.0", + "@sentry/integrations": "7.60.1", + "@sentry/node": "7.60.1", "axios": "^1.4.0", "body-parser": "1.20.2", "colors": "1.4.0", diff --git a/public/js/Room.js b/public/js/Room.js index ed1726de..ceb0b816 100644 --- a/public/js/Room.js +++ b/public/js/Room.js @@ -833,10 +833,10 @@ function roomIsReady() { BUTTONS.settings.lobbyButton && show(lobbyButton); BUTTONS.main.aboutButton && show(aboutButton); if (!DetectRTC.isMobileDevice) show(pinUnpinGridDiv); - loadSettings(); handleButtons(); handleSelects(); handleInputs(); + loadSettingsFromLocalStorage(); startSessionTimer(); document.body.addEventListener('mousemove', (e) => { showButtons(); @@ -917,21 +917,6 @@ function stopRecordingTimer() { clearInterval(recTimer); } -// #################################################### -// LOAD SETTINGS -// #################################################### - -function loadSettings() { - BtnVideoObjectFit.selectedIndex = lsSettings.video_obj_fit; - BtnVideoControls.selectedIndex = lsSettings.video_controls; - BtnsBarPosition.selectedIndex = lsSettings.buttons_bar; - pinVideoPosition.selectedIndex = lsSettings.pin_grid; - rc.handleVideoObjectFit(BtnVideoObjectFit.value); - rc.handleVideoControls(BtnVideoControls.value); - rc.changeBtnsBarPosition(BtnsBarPosition.value); - rc.togglePin(pinVideoPosition.value); -} - // #################################################### // HTML BUTTONS // #################################################### @@ -1460,6 +1445,21 @@ function handleInputs() { } } +// #################################################### +// LOAD SETTINGS FROM LOCAL STORAGE +// #################################################### + +function loadSettingsFromLocalStorage() { + BtnVideoObjectFit.selectedIndex = lsSettings.video_obj_fit; + BtnVideoControls.selectedIndex = lsSettings.video_controls; + BtnsBarPosition.selectedIndex = lsSettings.buttons_bar; + pinVideoPosition.selectedIndex = lsSettings.pin_grid; + rc.handleVideoObjectFit(BtnVideoObjectFit.value); + rc.handleVideoControls(BtnVideoControls.value); + rc.changeBtnsBarPosition(BtnsBarPosition.value); + rc.togglePin(pinVideoPosition.value); +} + // #################################################### // ROOM CLIENT EVENT LISTNERS // ####################################################