screenshare reload and scene issue fixes

This commit is contained in:
steveseguin 2023-05-13 03:52:45 -04:00
parent a7bd36e46b
commit 0afd701fb9
4 changed files with 12 additions and 6 deletions

View File

@ -83,7 +83,7 @@
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=47"></script>
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=642"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=643"></script>
<input id="zoomSlider" type="range" style="display: none;" />
<span id="electronDragZone" style="pointer-events: none; z-index:-10; position:absolute;top:0;left:0;width:100%;height:2%;-webkit-app-region: drag;min-height:20px;"></span>
<div id="header">
@ -2484,11 +2484,11 @@
// session.hidehome = true; // If used, 'hide home' will make the landing page inaccessible, along with hiding a few go-home elements.
// session.record = false; // uncomment to block users from being able to record via vdo.ninja's built in recording function
</script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=817"></script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=818"></script>
<!--
// If you wish to change branding, blank offers a good clean start.
<script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script>
-->
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=637"></script>
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=638"></script>
</body>
</html>

7
lib.js
View File

@ -1298,7 +1298,8 @@ session.obsSceneSync = function(){
session.sceneSync = function(UUID){
if (!session.rpcs[UUID].videoElement){return;} // i'll want to consider other things, such as canvas at some point.
if (!session.rpcs[UUID]){return;}
else if (!session.rpcs[UUID].videoElement){return;} // i'll want to consider other things, such as canvas at some point.
var msg = {};
msg.sceneDisplay = (session.rpcs[UUID].videoElement.style.display!="none");
@ -29047,14 +29048,16 @@ function initSceneList(UUID){
});
}
function updateSceneList(scene){
function updateSceneList(scene){ // custom scenes only.
if (!session.director){return;}
if (scene in session.sceneList){return;}
if ((parseInt(scene)+"")===scene){
if ((parseInt(scene)>=0) && (parseInt(scene)<=8)){
return;
}
}
session.sceneList[scene] = true;
for (var UUID in session.rpcs){
var newScene = document.createElement("div");

View File

@ -2259,6 +2259,8 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
}
} else if (urlParams.has("lightmode") || urlParams.has("lightmode")){
session.darkmode = false;
} else if (window.obsstudio){
session.darkmode = false; // prevent OBS from defaulting to dark mode, avoiding possible overlooked bugs.
} else {
session.darkmode = getComputedStyle(document.querySelector(':root')).getPropertyValue('--color-mode').trim();
if (session.darkmode == "dark"){
@ -2267,6 +2269,7 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
session.darkmode = false;
}
}
if (session.darkmode){
document.body.classList.add("darktheme");
//document.querySelector(':root').style.setProperty('--background-color',"#02050c" );

File diff suppressed because one or more lines are too long