From 0d522b55c5c431a0f5735d2dafe8f00756638e95 Mon Sep 17 00:00:00 2001 From: louis Date: Fri, 17 May 2019 13:00:05 -0400 Subject: [PATCH] fix urlparams play single value, questscenemstid --- Js/Main.js | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/Js/Main.js b/Js/Main.js index 2143311..7883194 100644 --- a/Js/Main.js +++ b/Js/Main.js @@ -217,18 +217,23 @@ function buildLanguageList() { function checkQueryParameters() { urlParams = commonFunctions.readQueryParameters(); - let cust; - if (urlParams['custom'] && urlParams['custom'] === "1") { - cust = CUSTOM.custom; - } else { - cust = CUSTOM.stock; - } - let playable = (urlParams['questSceneMstId'] && - utage.scenes[cust][urlParams['questSceneMstId']] && - utage.sceneTranslations[cust][urlParams['questSceneMstId']] && - utage.sceneTranslations[cust][urlParams['questSceneMstId']].Enabled); - if(playable) { - document.getElementById('play-from-query').style.cssText = "position: fixed; z-index: 15; text-align: center; top: 50%; left: 50%; display: block;"; + if (languagesLoaded) { + let cust; + + if (urlParams['custom'] && urlParams['custom'] === "1") { + cust = CUSTOM.custom; + } else { + cust = CUSTOM.stock; + } + + let playable = (urlParams['questscenemstid'] && + utage.scenes[cust][urlParams['questscenemstid']] && + utage.sceneTranslations[cust][urlParams['questscenemstid']] && + utage.sceneTranslations[cust][urlParams['questscenemstid']].Enabled); + + if(playable) { + document.getElementById('play-from-query').style.cssText = "position: fixed; z-index: 15; text-align: center; top: 50%; left: 50%; display: block;"; + } } } @@ -239,7 +244,7 @@ function playFromQuery(event) { } else { cust = CUSTOM.stock; } - sceneSet(urlParams['questSceneMstId'], cust); + sceneSet(urlParams['questscenemstid'], cust); document.getElementById('play-from-query').style.cssText = "display: none;"; } @@ -347,14 +352,14 @@ function closeModal(event) { function sceneSet(questSceneMstId, cust) { resetPlaylist(); - let part = document.getElementById('ChapterSelect').value; + let part = document.getElementById('ChapterSelect'); utage.scenes[cust][questSceneMstId]['QuestSceneMstId'] = questSceneMstId; - if (part === '{All}') { + if (!part || part.value === '{All}') { scenePlaylist.push(utage.scenes[cust][questSceneMstId]); } else { currentScene = utage.scenes[cust][questSceneMstId]; try { - partPlaylist.push.apply(partPlaylist, currentScene.Parts.slice(currentScene.Parts.indexOf(part))); + partPlaylist.push.apply(partPlaylist, currentScene.Parts.slice(currentScene.Parts.indexOf(part.value))); } catch (error) { console.log(error); return;