Skip to content

Commit

Permalink
Merge branch 'steveseguin:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
rgblack316 authored Feb 13, 2025
2 parents 7d15c8b + ec02e9b commit 1f60361
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
document.write("Internet Explorer is not supported");
window.location = "https://www.microsoft.com/edge";
}

// fix for OBS v31 (CEF) crashing when in IFRAME
if (window.obsstudio){
const style = document.createElement('style');
style.textContent = '*{-webkit-app-region:unset !important}';
document.documentElement.appendChild(style);
}
} catch(e){
console.error(e);
}
Expand Down Expand Up @@ -42,7 +49,7 @@

<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#0f131d" />
<link rel="stylesheet" href="./main.css?ver=401" />
<link rel="stylesheet" href="./main.css?ver=402" />
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/adapter.js"></script>

<link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon" />
Expand Down Expand Up @@ -1070,7 +1077,7 @@ <h2>If this page is unexpected, double check your links.</h2>

<div id="info" class="fullcolumn columnfade">
<center>
<div class="infoblob" align="left">
<div class="infoblob">
<span data-translate="info-blob">
<h2>What is VDO.Ninja</h2>
<br />
Expand All @@ -1088,9 +1095,6 @@ <h2>What is VDO.Ninja</h2>
<a href="https://docs.vdo.ninja/common-errors-and-known-issues/known-issues" title="For a list of common or known issues, click here" target="_blank"><span style="color: red;">Known issues:</span></a>
</i>
<br />
<li>
⚠️ OBS v31.0 does not support VDO.Ninja if it is in an IFRAME. The <a href="https://electroncapture.app/" target="_blank">Electron Capture app</a> is available as an alternative to bring VDO.Ninja into OBS.
</li>
<li>
If the video fails to load in OBS Studio, where the browser source remains blank, try disabling hardware-acceleration or
<a href='https://docs.vdo.ninja/common-errors-and-known-issues/obs.ninja-doesnt-show-up-in-obs-or-is-choppy' title="Click to link out to the VDO.Ninja help guide for common OBS Studio problems" target="_blank">refer to this help guide</a> for more.
Expand Down Expand Up @@ -2783,7 +2787,7 @@ <h3>Assign to slot:</h3><br />
<li><a onclick="changeLg('nl');toggle(document.getElementById('languages'));" style="cursor: pointer;" data-tz="Europe/Amsterdam">Dutch</a></li>
<li><a onclick="changeLg('tr');toggle(document.getElementById('languages'));" style="cursor: pointer;" data-tz="Europe/Istanbul">Turkish</a></li>
<li><a onclick="changeLg('ja');toggle(document.getElementById('languages'));" style="cursor: pointer;" data-tz="Asia/Tokyo">Japanese</a></li>
<li><a onclick="changeLg('ar');toggle(document.getElementById('languages'));" style="cursor: pointer;" data-tz="Asia/Arabic">Arabic</a></li>
<li><a onclick="changeLg('ar', true);toggle(document.getElementById('languages'));" style="cursor: pointer;" data-rtl="true" data-tz="Asia/Arabic">Arabic</a></li>
<li><a onclick="changeLg('cn');toggle(document.getElementById('languages'));" style="cursor: pointer;" data-tz="Asia/China">Chinese (中文)</a></li>
<li><a onclick="changeLg('cs');toggle(document.getElementById('languages'));" style="cursor: pointer;" data-tz="Europe/Prague">Czech</a></li>
<li><a onclick="changeLg('ru');toggle(document.getElementById('languages'));" style="cursor: pointer;" data-tz="Europe/Moscow">Russian</a></li>
Expand Down Expand Up @@ -2965,8 +2969,8 @@ <h3>Assign to slot:</h3><br />
// if ("42" != prompt("enter the password")){document.body.innerHTML = "";window.location.href = "";} // if you want a low-effort password for the site

</script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=1296"></script>
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=956"></script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=1297"></script>
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=957"></script>
<!-- <script type="text/javascript" crossorigin="anonymous" src="./trace.js?ver=1"></script>!-->
</body>
</html>

0 comments on commit 1f60361

Please sign in to comment.