yttt-xdu/XDUPlayer
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into release

Browse Source
This commit is contained in:
louis f 2018-12-29 12:10:52 -05:00
commit 01245c4477
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Js/Main.js
View File

@ -33,9 +33,9 @@ function onBodyLoaded() {
bodyLoaded = true; bodyLoaded = true;
document.getElementById("title-tag").innerText = version; document.getElementById("title-tag").innerText = version;
document.addEventListener('webkitfullscreenchange', onFullScreenChange, false); document.addEventListener('webkitfullscreenchange', onFullScreenChange, false);
document.addEventListener('mozfullscreenchange', onFullScreenChange, false); document.addEventListener('mozfullscreenchange', onFullScreenChange, false);
document.addEventListener('fullscreenchange', onFullScreenChange, false); document.addEventListener('fullscreenchange', onFullScreenChange, false);
document.addEventListener('MSFullscreenChange', onFullScreenChange, false); document.addEventListener('MSFullscreenChange', onFullScreenChange, false);
} }
(function startLoad() { (function startLoad() {
@ -77,12 +77,15 @@ function onAllLoaded(success) {
document.getElementById('parent-container').style.cssText = "opacity: 1;"; document.getElementById('parent-container').style.cssText = "opacity: 1;";
onWindowResize(); onWindowResize();
window.addEventListener("resize", onWindowResize); window.addEventListener("resize", onWindowResize);
checkQueryParameters(); if(urlParams['mstid'] && urlParams['id'] && utage.groupedMissions[urlParams['mstid']] && utage.groupedMissions[urlParams['mstid']].Missions[urlParams['id']]) {
document.getElementById('play-from-query').style.cssText = "position: fixed; z-index: 15; text-align: center; top: 50%; left: 50%; display: block;";
}
}, 0); }, 0);
} }
function loadLocalStorage() { function loadLocalStorage() {
try { try {
urlParams = commonFunctions.readQueryParameters();
//audio //audio
volume = localStorage.getItem('volume') || 0.5; volume = localStorage.getItem('volume') || 0.5;
volume = Number(volume); volume = Number(volume);
@ -100,7 +103,7 @@ function loadLocalStorage() {
document.getElementById('mute-button').innerText = "🔊"; document.getElementById('mute-button').innerText = "🔊";
} }
//language //language
let lang = localStorage.getItem('language') || "eng"; let lang = urlParams['lang'] || localStorage.getItem('language') || "eng";
if(languages.includes(lang)) { if(languages.includes(lang)) {
selectedLang = lang; selectedLang = lang;
} }
@ -153,13 +156,6 @@ function buildLanguageList() {
selectBox.value = selectedLang; selectBox.value = selectedLang;
} }
function checkQueryParameters() {
urlParams = commonFunctions.readQueryParameters();
if(urlParams['mstid'] && urlParams['id'] && utage.groupedMissions[urlParams['mstid']] && utage.groupedMissions[urlParams['mstid']].Missions[urlParams['id']]) {
document.getElementById('play-from-query').style.cssText = "position: fixed; z-index: 15; text-align: center; top: 50%; left: 50%; display: block;";
}
}
function playFromQuery(event) { function playFromQuery(event) {
missionChanged(urlParams['mstid'], urlParams['id']); missionChanged(urlParams['mstid'], urlParams['id']);
document.getElementById('play-from-query').style.cssText = "display: none;"; document.getElementById('play-from-query').style.cssText = "display: none;";