Housecleaning

index.php

@@ -1249,7 +1249,7 @@ class="joystickBase" />
               <thead>
                 <tr>
                   <th>#</th>
-                  <th>Player</th>
+                  <th data-i18n="[html]modal.rankings.player">Player</th>
                   <th id="rankingValueHeader"></th>
                 </tr>
               </thead>

init.js

@@ -68,6 +68,8 @@ const apiUrl = `${serverUrl}/api`;
 const adminApiUrl = `${serverUrl}/admin`;
 const ynomojiUrlPrefix = 'images/ynomoji/';
 
+let initBlocker = Promise.resolve();
+
 async function injectScripts() {
   const supportsSimd = await wasmFeatureDetect.simd();
 
@@ -89,7 +91,7 @@ async function injectScripts() {
     const script = scripts[index];
     const loadFunc = index < scripts.length - 1
       ? () => injectScript(index + 1)
-      : () => { // Assumes last script is index.js
+      : async () => { // Assumes last script is index.js
         if (typeof ENV !== 'undefined')
           ENV.SDL_EMSCRIPTEN_KEYBOARD_ELEMENT = '#canvas';
 
@@ -118,6 +120,8 @@ async function injectScripts() {
         if (typeof onResize !== 'undefined')
           easyrpgPlayerLoadFuncs.push(onResize);
 
+        await initBlocker;
+
         createEasyRpgPlayer(easyrpgPlayer)
           .then(function(Module) {
             // Module is ready

lang/ar.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "المراتب"
+        "title": "المراتب",
+        "player": "Player"
       },
       "screenshot": {
         "title": "صور الشاشة",

lang/de.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Rankings"
+        "title": "Rankings",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Your Screenshot",

lang/en.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Rankings"
+        "title": "Rankings",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Your Screenshot",

lang/eo.json

@@ -431,7 +431,8 @@
         }
       },
       "rankings": {
-        "title": "Rangolisto"
+        "title": "Rangolisto",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Via Ekrankopio",

lang/es.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Clasificaciones"
+        "title": "Clasificaciones",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Your Screenshot",

lang/fr.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Classement"
+        "title": "Classement",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Votre capture d'écran",

lang/it.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Classifiche"
+        "title": "Classifiche",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Your Screenshot",

lang/ja.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "ランキング"
+        "title": "ランキング",
+        "player": "Player"
       },
       "screenshot": {
         "title": "スクリーンショット",

lang/ko.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "랭킹"
+        "title": "랭킹",
+        "player": "Player"
       },
       "screenshot": {
         "title": "나의 스크린샷",

lang/pl.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Rankingi"
+        "title": "Rankingi",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Twój zrzut ekranu",

lang/pt.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Placares"
+        "title": "Placares",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Suas Capturas de Tela",

lang/ro.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Ranguri"
+        "title": "Ranguri",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Your Screenshot",

lang/ru.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Рейтинги"
+        "title": "Рейтинги",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Ваш снимок",

lang/tr.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Sıralamalar"
+        "title": "Sıralamalar",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Ekran Görüntünüz",

lang/vi.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "Bảng Xếp Hạng"
+        "title": "Bảng Xếp Hạng",
+        "player": "Player"
       },
       "screenshot": {
         "title": "Ảnh chụp màn hình của bạn",

lang/zh.json

@@ -432,7 +432,8 @@
         }
       },
       "rankings": {
-        "title": "排行榜"
+        "title": "排行榜",
+        "player": "Player"
       },
       "screenshot": {
         "title": "屏幕截图",

play.css

@@ -251,7 +251,7 @@ body {
   -webkit-text-fill-color: transparent;
 }
 
-.spoiler:not(.show) a {
+.spoiler:not(.show):not(.screenshotItem:hover) a {
   opacity: 0;
   pointer-events: none;
 }

play.js

@@ -1637,18 +1637,31 @@ document.onmousemove = function (ev) {
   }
 };
 
+async function withTimeout(duration, prom) {
+  let handle;
+  const timeout = new Promise(resolve => handle = setTimeout(() => resolve('__timeout__'), duration));
+  const res = await Promise.race([timeout, prom]);
+  if (res === '__timeout__') {
+    console.warn(`timed out after ${duration} ms`, prom);
+  }
+  clearTimeout(handle);
+  return res;
+}
+
 const rtlLangs = ['ar'];
 function setLang(lang, isInit) {
   if (rtlLangs.includes(lang))
     document.documentElement.setAttribute('dir', 'rtl');
   else
     document.documentElement.removeAttribute('dir');
   globalConfig.lang = lang;
-  fetchNewest(`../data/${gameId}/Language/${lang}/meta.ini`).then(response => { // Prevent a crash when the --language argument is used and the game doesn't have a Language folder
-  if (response.ok && response.status < 400 && isInit && gameIds.indexOf(gameId) > -1) {
-    easyrpgPlayer.language = (gameDefaultLangs.hasOwnProperty(gameId) ? gameDefaultLangs[gameId] !== lang : lang !== 'en') ? lang : 'default';
-    }
-  });
+  initBlocker = initBlocker.then(() => withTimeout(500, // TODO Is this enough?
+    fetchNewest(`../data/${gameId}/Language/${lang}/meta.ini`).then(response => { // Prevent a crash when the --language argument is used and the game doesn't have a Language folder
+      if (response.ok && response.status < 400 && isInit && gameIds.indexOf(gameId) > -1) {
+        easyrpgPlayer.language = (gameDefaultLangs.hasOwnProperty(gameId) ? gameDefaultLangs[gameId] !== lang : lang !== 'en') ? lang : 'default';
+      }
+    })
+  ));
   initLocalization(isInit);
   if (!isInit)
     updateConfig(globalConfig, true);
@@ -2456,8 +2469,10 @@ function openWikiModal(url, asImg) {
       wikiFrame.addEventListener('load', () => removeLoader(wikiModal), { once: true });
     }
   }
-  if (wikiModal.classList.contains('hidden'))
-    openModal('wikiModal');
+  if (wikiModal.classList.contains('hidden')) { 
+    const activeModal = document.querySelector('#modalContainer .modal:not(.hidden)');
+    openModal('wikiModal', undefined, activeModal?.id);
+  }
 }
 
 function checkShowVersionUpdate() {